Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs =================================================================== diff -u -rb2fcf3397249818ed401f0de71a60a156b101e4b -r89f8d4ebf029154bc9da2d534250fae6cad5e8d9 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision b2fcf3397249818ed401f0de71a60a156b101e4b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 89f8d4ebf029154bc9da2d534250fae6cad5e8d9) @@ -85,6 +85,8 @@ /// The failure probability structure with erosion. /// The mean of the storm duration. /// The variation of the storm duration. + /// The mean of the model factor long threshold. + /// The standard deviation of the model factor long threshold. /// The mean of the bank width. /// The standard deviation of the bank width. /// The evaluation level. @@ -103,8 +105,6 @@ /// The variation of the constructive strength linear load model. /// The mean of the stability linear load model. /// The variation of the stability linear load model. - /// The mean of the model factor long threshold. - /// The standard deviation of the model factor long threshold. public StructuresStabilityPointFloodedCulvertLinearCalculationInput(long hydraulicBoundaryLocationId, double sectionNormal, IEnumerable forelandPoints, @@ -133,6 +133,7 @@ double criticalOvertoppingDischargeMean, double criticalOvertoppingDischargeVariation, double failureProbabilityStructureWithErosion, double stormDurationMean, double stormDurationVariation, + double modelFactorLongThresholdMean, double modelFactorLongThresholdStandardDeviation, double bankWidthMean, double bankWidthStandardDeviation, double evaluationLevel, double modelFactorLoadEffectMean, double modelFactorLoadEffectStandardDeviation, @@ -143,8 +144,7 @@ double drainCoefficientMean, double drainCoefficientStandardDeviation, double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, double constructiveStrengthLinearLoadModelMean, double constructiveStrengthLinearLoadModelVariation, - double stabilityLinearLoadModelMean, double stabilityLinearLoadModelVariation, - double modelFactorLongThresholdMean, double modelFactorLongThresholdStandardDeviation) + double stabilityLinearLoadModelMean, double stabilityLinearLoadModelVariation) : base(hydraulicBoundaryLocationId, sectionNormal, forelandPoints, breakWater, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs =================================================================== diff -u -ree18f86a1655fac1b7a73bce1baaab7e91cba46e -r89f8d4ebf029154bc9da2d534250fae6cad5e8d9 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision ee18f86a1655fac1b7a73bce1baaab7e91cba46e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 89f8d4ebf029154bc9da2d534250fae6cad5e8d9) @@ -80,26 +80,26 @@ const double failureProbabilityStructureWithErosion = 37.37; const double stormDurationMean = 38.38; const double stormDurationVariation = 39.39; - const double bankWidthMean = 40.40; - const double bankWidthStandardDeviation = 41.41; - const double evaluationLevel = 42.42; - const double modelFactorLoadEffectMean = 43.43; - const double modelFactorLoadEffectStandardDeviation = 44.44; - const double waveRatioMaxHN = 45.45; - const double waveRatioMaxHStandardDeviation = 46.46; - const double verticalDistance = 47.47; - const double modificationFactorWavesSlowlyVaryingPressureComponent = 48.48; - const double modificationFactorDynamicOrImpulsivePressureComponent = 49.49; - const double drainCoefficientMean = 50.50; - const double drainCoefficientStandardDeviation = 51.51; - const double areaFlowAperturesMean = 52.52; - const double areaFlowAperturesStandardDeviation = 53.53; - const double constructiveStrengthLinearLoadModelMean = 54.54; - const double constructiveStrengthLinearLoadModelVariation = 55.55; - const double stabilityLinearLoadModelMean = 56.56; - const double stabilityLinearLoadModelVariation = 57.57; - const double modelFactorLongThresholdMean = 58.58; - const double modelFactorLongThresholdStandardDeviation = 59.59; + const double modelFactorLongThresholdMean = 40.40; + const double modelFactorLongThresholdStandardDeviation = 41.41; + const double bankWidthMean = 42.42; + const double bankWidthStandardDeviation = 43.43; + const double evaluationLevel = 44.44; + const double modelFactorLoadEffectMean = 45.45; + const double modelFactorLoadEffectStandardDeviation = 46.46; + const double waveRatioMaxHN = 47.47; + const double waveRatioMaxHStandardDeviation = 48.48; + const double verticalDistance = 49.49; + const double modificationFactorWavesSlowlyVaryingPressureComponent = 50.50; + const double modificationFactorDynamicOrImpulsivePressureComponent = 51.51; + const double drainCoefficientMean = 52.52; + const double drainCoefficientStandardDeviation = 53.53; + const double areaFlowAperturesMean = 54.54; + const double areaFlowAperturesStandardDeviation = 55.55; + const double constructiveStrengthLinearLoadModelMean = 56.56; + const double constructiveStrengthLinearLoadModelVariation = 57.57; + const double stabilityLinearLoadModelMean = 58.58; + const double stabilityLinearLoadModelVariation = 59.59; // Call var input = new StructuresStabilityPointFloodedCulvertLinearCalculationInput(hydraulicBoundaryLocationId, sectionNormal, @@ -128,6 +128,7 @@ criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, failureProbabilityStructureWithErosion, stormDurationMean, stormDurationVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation, bankWidthMean, bankWidthStandardDeviation, evaluationLevel, modelFactorLoadEffectMean, modelFactorLoadEffectStandardDeviation, @@ -138,8 +139,7 @@ drainCoefficientMean, drainCoefficientStandardDeviation, areaFlowAperturesMean, areaFlowAperturesStandardDeviation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation, - stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation, - modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); + stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation); // Assert Assert.IsInstanceOf(input); @@ -194,11 +194,11 @@ yield return new DeterministicHydraRingVariable(61, 5.5); yield return new DeterministicHydraRingVariable(63, 6.6); yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 7.7, 8.8); - yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 50.50, 51.51); - yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 52.52, 53.53); - yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, 54.54, 55.55); + yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53); + yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 54.54, 55.55); + yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, 56.56, 57.57); yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 9.9, 10.10); - yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, 56.56, 57.57); + yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, 58.58, 59.59); yield return new DeterministicHydraRingVariable(85, 11.11); yield return new LogNormalHydraRingVariable(86, HydraRingDeviationType.Variation, 12.12, 13.13); yield return new NormalHydraRingVariable(87, HydraRingDeviationType.Variation, 14.14, 15.15); @@ -216,14 +216,14 @@ yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 35.35, 36.36); yield return new DeterministicHydraRingVariable(105, 37.37); yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 38.38, 39.39); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 58.58, 59.59); - yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 40.40, 41.41); - yield return new DeterministicHydraRingVariable(131, 42.42); - yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 43.43, 44.44); - yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 45.45, 46.46); - yield return new DeterministicHydraRingVariable(134, 47.47); - yield return new DeterministicHydraRingVariable(135, 48.48); - yield return new DeterministicHydraRingVariable(136, 49.49); + yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 40.40, 41.41); + yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.42, 43.43); + yield return new DeterministicHydraRingVariable(131, 44.44); + yield return new NormalHydraRingVariable(132, HydraRingDeviationType.Standard, 45.45, 46.46); + yield return new RayleighNHydraRingVariable(133, HydraRingDeviationType.Standard, 47.47, 48.48); + yield return new DeterministicHydraRingVariable(134, 49.49); + yield return new DeterministicHydraRingVariable(135, 50.50); + yield return new DeterministicHydraRingVariable(136, 51.51); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r03e6a10fbc7b30a5a9ad946c2f99ab011a7f874a -r89f8d4ebf029154bc9da2d534250fae6cad5e8d9 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 03e6a10fbc7b30a5a9ad946c2f99ab011a7f874a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 89f8d4ebf029154bc9da2d534250fae6cad5e8d9) @@ -1629,11 +1629,11 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 61, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 63, 6.6, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 65, 0, 2, 7.7, 8.8, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 2, 50, 51.1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 67, 0, 4, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 80, 0, 4, 54.4, NULL, NULL, NULL, 0, 55.5, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 2, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 67, 0, 4, 54.4, 55.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 80, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 9.9, 10, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 83, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 83, 0, 4, 58.8, NULL, NULL, NULL, 0, 59.9, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 11.1, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 86, 0, 4, 12.2, NULL, NULL, NULL, 0, 13.3, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 87, 0, 2, 14.4, NULL, NULL, NULL, 0, 15.5, 999999);" + Environment.NewLine + @@ -1651,14 +1651,14 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 104, 0, 4, 35.5, NULL, NULL, NULL, 0, 36.6, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 37.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 108, 0, 4, 38.8, NULL, NULL, NULL, 0, 39.9, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 125, 0, 2, 58.8, 59.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 40, 41.1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 131, 42.2, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 132, 0, 2, 43.3, 44.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 133, 0, 18, 46.6, 45.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 134, 47.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 135, 48.8, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 136, 49.9, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 125, 0, 2, 40, 41.1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 42.2, 43.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 131, 44.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 132, 0, 2, 45.5, 46.6, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 133, 0, 18, 48.8, 47.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 134, 49.9, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 135, 50, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 136, 51.1, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine + Environment.NewLine + Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r03e6a10fbc7b30a5a9ad946c2f99ab011a7f874a -r89f8d4ebf029154bc9da2d534250fae6cad5e8d9 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 03e6a10fbc7b30a5a9ad946c2f99ab011a7f874a) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 89f8d4ebf029154bc9da2d534250fae6cad5e8d9) @@ -333,6 +333,8 @@ structureInput.FailureProbabilityStructureWithErosion, structureInput.StormDuration.Mean, structureInput.StormDuration.CoefficientOfVariation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation, structureInput.BankWidth.Mean, structureInput.BankWidth.StandardDeviation, structureInput.EvaluationLevel, @@ -350,9 +352,7 @@ structureInput.ConstructiveStrengthLinearLoadModel.Mean, structureInput.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, structureInput.StabilityLinearLoadModel.Mean, - structureInput.StabilityLinearLoadModel.CoefficientOfVariation, - generalInput.ModelFactorLongThreshold.Mean, - generalInput.ModelFactorLongThreshold.StandardDeviation); + structureInput.StabilityLinearLoadModel.CoefficientOfVariation); } private static StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput( Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r03e6a10fbc7b30a5a9ad946c2f99ab011a7f874a -r89f8d4ebf029154bc9da2d534250fae6cad5e8d9 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 03e6a10fbc7b30a5a9ad946c2f99ab011a7f874a) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 89f8d4ebf029154bc9da2d534250fae6cad5e8d9) @@ -1136,6 +1136,8 @@ input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation, input.BankWidth.Mean, input.BankWidth.StandardDeviation, input.EvaluationLevel, @@ -1153,9 +1155,7 @@ input.ConstructiveStrengthLinearLoadModel.Mean, input.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, input.StabilityLinearLoadModel.Mean, - input.StabilityLinearLoadModel.CoefficientOfVariation, - generalInput.ModelFactorLongThreshold.Mean, - generalInput.ModelFactorLongThreshold.StandardDeviation); + input.StabilityLinearLoadModel.CoefficientOfVariation); var actualInput = (StructuresStabilityPointFloodedCulvertLinearCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); @@ -1258,6 +1258,8 @@ input.FailureProbabilityStructureWithErosion, input.StormDuration.Mean, input.StormDuration.CoefficientOfVariation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation, input.BankWidth.Mean, input.BankWidth.StandardDeviation, input.EvaluationLevel, @@ -1275,9 +1277,7 @@ input.ConstructiveStrengthLinearLoadModel.Mean, input.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, input.StabilityLinearLoadModel.Mean, - input.StabilityLinearLoadModel.CoefficientOfVariation, - generalInput.ModelFactorLongThreshold.Mean, - generalInput.ModelFactorLongThreshold.StandardDeviation); + input.StabilityLinearLoadModel.CoefficientOfVariation); var actualInput = (StructuresStabilityPointFloodedCulvertLinearCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput);