Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs =================================================================== diff -u -racbfe5601241d7e7e0470194aab84b9425621d54 -rfab6b7bea64540c3fb4c9abd0f825e1d8c71e4f6 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision acbfe5601241d7e7e0470194aab84b9425621d54) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision fab6b7bea64540c3fb4c9abd0f825e1d8c71e4f6) @@ -47,6 +47,7 @@ private const int modelFactorStorageVolumePropertyIndex = 8; private const int modelFactorCollisionLoadPropertyIndex = 9; private const int modelFactorLoadEffectPropertyIndex = 10; + private const int modelFactorLongThresholdPropertyIndex = 11; /// /// Creates a new instance of . @@ -99,7 +100,8 @@ || nameof(GravitationalAcceleration).Equals(propertyName) || nameof(ModelFactorStorageVolume).Equals(propertyName) || nameof(ModelFactorCollisionLoad).Equals(propertyName) - || nameof(ModelFactorLoadEffect).Equals(propertyName); + || nameof(ModelFactorLoadEffect).Equals(propertyName) + || nameof(ModelFactorLongThreshold).Equals(propertyName); } #region General @@ -224,6 +226,20 @@ } } + [DynamicVisible] + [PropertyOrder(modelFactorLongThresholdPropertyIndex)] + [TypeConverter(typeof(ExpandableObjectConverter))] + [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))] + [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.StructuresInputFailureMechanismContext_ModelFactorLongThreshold_DisplayName))] + [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.StructuresInputFailureMechanismContext_ModelFactorLongThreshold_Description))] + public NormalDistributionProperties ModelFactorLongThreshold + { + get + { + return new NormalDistributionProperties(data.GeneralInput.ModelFactorLongThreshold); + } + } + #endregion } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs =================================================================== diff -u -r84fd247421bee82f431195fd74d998bf8b87fa52 -rfab6b7bea64540c3fb4c9abd0f825e1d8c71e4f6 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 84fd247421bee82f431195fd74d998bf8b87fa52) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision fab6b7bea64540c3fb4c9abd0f825e1d8c71e4f6) @@ -46,6 +46,7 @@ private const int modelFactorStorageVolumePropertyIndex = 7; private const int modelFactorCollisionLoadPropertyIndex = 8; private const int modelFactorLoadEffectPropertyIndex = 9; + private const int modelFactorLongThresholdPropertyIndex = 10; [Test] public void Constructor_DataIsNull_ThrowArgumentNullException() @@ -90,6 +91,8 @@ Assert.AreEqual(generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, properties.ModelFactorCollisionLoad.CoefficientOfVariation); Assert.AreEqual(generalInput.ModelFactorLoadEffect.Mean, properties.ModelFactorLoadEffect.Mean); Assert.AreEqual(generalInput.ModelFactorLoadEffect.StandardDeviation, properties.ModelFactorLoadEffect.StandardDeviation); + Assert.AreEqual(generalInput.ModelFactorLongThreshold.Mean, properties.ModelFactorLongThreshold.Mean); + Assert.AreEqual(generalInput.ModelFactorLongThreshold.StandardDeviation, properties.ModelFactorLongThreshold.StandardDeviation); } [Test] @@ -110,7 +113,7 @@ const string modelSettingsCategory = "Modelinstellingen"; PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(10, dynamicProperties.Count); + Assert.AreEqual(11, dynamicProperties.Count); PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty, @@ -183,6 +186,14 @@ "Modelfactor belastingeffect [-]", "Modelfactor belastingeffect.", true); + + PropertyDescriptor modelFactorLongThresholdProperty = dynamicProperties[modelFactorLongThresholdPropertyIndex]; + Assert.IsInstanceOf(modelFactorLongThresholdProperty.Converter); + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(modelFactorLongThresholdProperty, + modelSettingsCategory, + "Modelfactor lange overlaat[-]", + "Modelfactor voor een lange overlaat.", + true); } [Test] @@ -307,6 +318,7 @@ Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorStorageVolume))); Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorCollisionLoad))); Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorLoadEffect))); + Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactorLongThreshold))); Assert.IsTrue(properties.DynamicVisibleValidationMethod(null)); }