Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs =================================================================== diff -u -rccde3d1e509a8e080fffa3f4f8867c60b38f8ca7 -ree18f86a1655fac1b7a73bce1baaab7e91cba46e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision ccde3d1e509a8e080fffa3f4f8867c60b38f8ca7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision ee18f86a1655fac1b7a73bce1baaab7e91cba46e) @@ -38,6 +38,8 @@ private readonly double constructiveStrengthLinearLoadModelVariation; private readonly double stabilityLinearLoadModelMean; private readonly double stabilityLinearLoadModelVariation; + private readonly double modelFactorLongThresholdMean; + private readonly double modelFactorLongThresholdStandardDeviation; /// /// Creates a new instance of . @@ -103,6 +105,8 @@ /// 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, @@ -141,7 +145,8 @@ double drainCoefficientMean, double drainCoefficientStandardDeviation, double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation, double constructiveStrengthLinearLoadModelMean, double constructiveStrengthLinearLoadModelVariation, - double stabilityLinearLoadModelMean, double stabilityLinearLoadModelVariation) + double stabilityLinearLoadModelMean, double stabilityLinearLoadModelVariation, + double modelFactorLongThresholdMean, double modelFactorLongThresholdStandardDeviation) : base(hydraulicBoundaryLocationId, sectionNormal, forelandPoints, breakWater, @@ -185,6 +190,8 @@ this.constructiveStrengthLinearLoadModelVariation = constructiveStrengthLinearLoadModelVariation; this.stabilityLinearLoadModelMean = stabilityLinearLoadModelMean; this.stabilityLinearLoadModelVariation = stabilityLinearLoadModelVariation; + this.modelFactorLongThresholdMean = modelFactorLongThresholdMean; + this.modelFactorLongThresholdStandardDeviation = modelFactorLongThresholdStandardDeviation; } public override IEnumerable Variables @@ -221,7 +228,7 @@ yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation); yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation); yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation); - 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/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs =================================================================== diff -u -rccde3d1e509a8e080fffa3f4f8867c60b38f8ca7 -ree18f86a1655fac1b7a73bce1baaab7e91cba46e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision ccde3d1e509a8e080fffa3f4f8867c60b38f8ca7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision ee18f86a1655fac1b7a73bce1baaab7e91cba46e) @@ -98,6 +98,8 @@ 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; // Call var input = new StructuresStabilityPointFloodedCulvertLinearCalculationInput(hydraulicBoundaryLocationId, sectionNormal, @@ -136,7 +138,8 @@ drainCoefficientMean, drainCoefficientStandardDeviation, areaFlowAperturesMean, areaFlowAperturesStandardDeviation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation, - stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation); + stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation, + modelFactorLongThresholdMean, modelFactorLongThresholdStandardDeviation); // Assert Assert.IsInstanceOf(input); @@ -174,7 +177,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, 56.56, 57.57); + 53.53, 54.54, 55.55, 56.56, 57.57, 58.85, 59.59); // Call int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId); @@ -213,7 +216,7 @@ 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, 0.9, 0.05); + 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); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -rccde3d1e509a8e080fffa3f4f8867c60b38f8ca7 -ree18f86a1655fac1b7a73bce1baaab7e91cba46e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision ccde3d1e509a8e080fffa3f4f8867c60b38f8ca7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision ee18f86a1655fac1b7a73bce1baaab7e91cba46e) @@ -1582,7 +1582,8 @@ 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, 56.6, 57.7) + 55.5, 56.6, 57.7, 58.8, + 59.9) { PreprocessorSetting = CreatePreprocessorSetting(runPreprocessor), DesignTablesSetting = new DesignTablesSetting(0, 0), @@ -1650,7 +1651,7 @@ "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, 0.9, 0.05, NULL, NULL, 1, 0, 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 + @@ -1749,7 +1750,8 @@ 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, 56.6, 57.7, 58.8, 59.9) + 55.5, 56.6, 57.7, 58.8, + 59.9) { PreprocessorSetting = CreatePreprocessorSetting(runPreprocessor), DesignTablesSetting = new DesignTablesSetting(0, 0), Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r9bbed07929837ea484c6d3a8424eda86148af481 -ree18f86a1655fac1b7a73bce1baaab7e91cba46e --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 9bbed07929837ea484c6d3a8424eda86148af481) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision ee18f86a1655fac1b7a73bce1baaab7e91cba46e) @@ -350,7 +350,9 @@ structureInput.ConstructiveStrengthLinearLoadModel.Mean, structureInput.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, structureInput.StabilityLinearLoadModel.Mean, - structureInput.StabilityLinearLoadModel.CoefficientOfVariation); + structureInput.StabilityLinearLoadModel.CoefficientOfVariation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation); } private static StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput( Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r9bbed07929837ea484c6d3a8424eda86148af481 -ree18f86a1655fac1b7a73bce1baaab7e91cba46e --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 9bbed07929837ea484c6d3a8424eda86148af481) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision ee18f86a1655fac1b7a73bce1baaab7e91cba46e) @@ -1153,7 +1153,9 @@ input.ConstructiveStrengthLinearLoadModel.Mean, input.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, input.StabilityLinearLoadModel.Mean, - input.StabilityLinearLoadModel.CoefficientOfVariation); + input.StabilityLinearLoadModel.CoefficientOfVariation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation); var actualInput = (StructuresStabilityPointFloodedCulvertLinearCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); @@ -1273,7 +1275,9 @@ input.ConstructiveStrengthLinearLoadModel.Mean, input.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, input.StabilityLinearLoadModel.Mean, - input.StabilityLinearLoadModel.CoefficientOfVariation); + input.StabilityLinearLoadModel.CoefficientOfVariation, + generalInput.ModelFactorLongThreshold.Mean, + generalInput.ModelFactorLongThreshold.StandardDeviation); var actualInput = (StructuresStabilityPointFloodedCulvertLinearCalculationInput) calculationInputs[0]; HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput);