Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs =================================================================== diff -u -r8a6ff462fdb8fe288eb051d097bed95d6e743a61 -r9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 8a6ff462fdb8fe288eb051d097bed95d6e743a61) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994) @@ -36,6 +36,8 @@ private readonly double stabilityQuadraticLoadModelVariation; private readonly double widthFlowAperturesMean; private readonly double widthFlowAperturesStandardDeviation; + private readonly double modelFactorLongThresholdMean; + private readonly double modelFactorLongThresholdStandardDeviation; /// /// Creates a new instance of . @@ -99,6 +101,8 @@ /// The variation of the stability quadratic load model. /// The mean of the width flow apertures. /// The standard deviation of the width flow apertures. + /// The mean of the model factor long threshold. + /// The standard deviation of the model factor long threshold. public StructuresStabilityPointLowSillQuadraticCalculationInput(long hydraulicBoundaryLocationId, double sectionNormal, IEnumerable forelandPoints, @@ -136,7 +140,8 @@ double modificationFactorDynamicOrImpulsivePressureComponent, double constructiveStrengthQuadraticLoadModelMean, double constructiveStrengthQuadraticLoadModelVariation, double stabilityQuadraticLoadModelMean, double stabilityQuadraticLoadModelVariation, - double widthFlowAperturesMean, double widthFlowAperturesStandardDeviation) + double widthFlowAperturesMean, double widthFlowAperturesStandardDeviation, + double modelFactorLongThresholdMean, double modelFactorLongThresholdStandardDeviation) : base(hydraulicBoundaryLocationId, sectionNormal, forelandPoints, breakWater, @@ -178,6 +183,8 @@ this.stabilityQuadraticLoadModelVariation = stabilityQuadraticLoadModelVariation; this.widthFlowAperturesMean = widthFlowAperturesMean; this.widthFlowAperturesStandardDeviation = widthFlowAperturesStandardDeviation; + this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; + this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; } public override IEnumerable Variables @@ -213,7 +220,7 @@ yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation); yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation); yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 0.9, 0.05); + yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs =================================================================== diff -u -r8a6ff462fdb8fe288eb051d097bed95d6e743a61 -r9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 8a6ff462fdb8fe288eb051d097bed95d6e743a61) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994) @@ -96,6 +96,8 @@ const double stabilityQuadraticLoadModelVariation = 53.53; const double widthFlowAperturesMean = 54.54; const double widthFlowAperturesStandardDeviation = 55.55; + const double modelFactorLongThresholdMean = 56.56; + const double modelFactorLongThresholdStandardDeviation = 57.57; // Call var input = new StructuresStabilityPointLowSillQuadraticCalculationInput(hydraulicBoundaryLocationId, sectionNormal, @@ -133,7 +135,8 @@ modificationFactorDynamicOrImpulsivePressureComponent, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation, - widthFlowAperturesMean, widthFlowAperturesStandardDeviation); + widthFlowAperturesMean, widthFlowAperturesStandardDeviation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); // Assert Assert.IsInstanceOf(input); @@ -171,7 +174,7 @@ 32.32, 33.33, 34.34, 35.35, 36.36, 37.37, 38.38, 39.39, 40.40, 41.41, 42.42, 43.43, 44.44, 45.45, 46.46, 47.47, 48.48, 49.49, 50.50, 51.51, 52.52, - 53.53, 54.54, 55.55); + 53.53, 54.54, 55.55, 56.56, 57.57); // Call int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId); @@ -209,7 +212,7 @@ yield return new DeterministicHydraRingVariable(105, 37.37); yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, 54.54, 55.55); yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 38.38, 39.39); - yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 0.9, 0.05); + yield return new NormalHydraRingVariable(125, HydraRingDeviationType.Standard, 56.56, 57.57); 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); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -recdb82bafd3f84c6b857f7916d95cae6d3e2be18 -r9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision ecdb82bafd3f84c6b857f7916d95cae6d3e2be18) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994) @@ -2081,7 +2081,7 @@ 43.3, 44.4, 45.5, 46.6, 47.7, 48.8, 49.9, 50.0, 51.1, 52.2, 53.3, 54.4, - 55.5) + 55.5, 56.6, 57.7) { PreprocessorSetting = CreatePreprocessorSetting(runPreprocessor), DesignTablesSetting = new DesignTablesSetting(0, 0), @@ -2148,7 +2148,7 @@ "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, 106, 0, 2, 54.4, 55.5, 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, 0.9, 0.05, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 125, 0, 2, 56.6, 57.7, 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 + Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -recdb82bafd3f84c6b857f7916d95cae6d3e2be18 -r9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision ecdb82bafd3f84c6b857f7916d95cae6d3e2be18) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994) @@ -280,7 +280,9 @@ structureInput.StabilityQuadraticLoadModel.Mean, structureInput.StabilityQuadraticLoadModel.CoefficientOfVariation, structureInput.WidthFlowApertures.Mean, - structureInput.WidthFlowApertures.StandardDeviation); + structureInput.WidthFlowApertures.StandardDeviation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation); } private static StructuresStabilityPointFloodedCulvertLinearCalculationInput CreateFloodedCulvertLinearCalculationInput( Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -recdb82bafd3f84c6b857f7916d95cae6d3e2be18 -r9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision ecdb82bafd3f84c6b857f7916d95cae6d3e2be18) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 9ff4aed4b5fccf9f13ad2fd63c4fe203b7782994) @@ -907,7 +907,9 @@ input.StabilityQuadraticLoadModel.Mean, input.StabilityQuadraticLoadModel.CoefficientOfVariation, input.WidthFlowApertures.Mean, - input.WidthFlowApertures.StandardDeviation); + input.WidthFlowApertures.StandardDeviation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation); var actualInput = (StructuresStabilityPointLowSillQuadraticCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); @@ -1024,7 +1026,9 @@ input.StabilityQuadraticLoadModel.Mean, input.StabilityQuadraticLoadModel.CoefficientOfVariation, input.WidthFlowApertures.Mean, - input.WidthFlowApertures.StandardDeviation); + input.WidthFlowApertures.StandardDeviation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation); var actualInput = (StructuresStabilityPointLowSillQuadraticCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput);