Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf9241a51f8525620485436283b49f525fc6cfff5 -r2109804607e2c1041dc78167f44c116f0bee45df
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f9241a51f8525620485436283b49f525fc6cfff5)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2109804607e2c1041dc78167f44c116f0bee45df)
@@ -473,6 +473,24 @@
}
///
+ /// Looks up a localized string similar to Modelfactor die wordt gebruikt bij de berekening van de benaderde faalkans op basis van de berekende stabiliteitsfactor..
+ ///
+ public static string MacroStabilityInwardsFailureMechanismProperties_ModelFactor_Description {
+ get {
+ return ResourceManager.GetString("MacroStabilityInwardsFailureMechanismProperties_ModelFactor_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Modelfactor [-].
+ ///
+ public static string MacroStabilityInwardsFailureMechanismProperties_ModelFactor_DisplayName {
+ get {
+ return ResourceManager.GetString("MacroStabilityInwardsFailureMechanismProperties_ModelFactor_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to De locatie met hydraulische randvoorwaarden waarvan het berekende toetspeil wordt gebruikt..
///
public static string MacroStabilityInwardsInput_HydraulicBoundaryLocation_Description {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -rf9241a51f8525620485436283b49f525fc6cfff5 -r2109804607e2c1041dc78167f44c116f0bee45df
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision f9241a51f8525620485436283b49f525fc6cfff5)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2109804607e2c1041dc78167f44c116f0bee45df)
@@ -745,4 +745,10 @@
[-]
+
+ Modelfactor die wordt gebruikt bij de berekening van de benaderde faalkans op basis van de berekende stabiliteitsfactor.
+
+
+ Modelfactor [-]
+
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs
===================================================================
diff -u -r60e5e7fd23d7d028fbf73251126ab5672d5ca8b9 -r2109804607e2c1041dc78167f44c116f0bee45df
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs (.../MacroStabilityInwardsFailureMechanismProperties.cs) (revision 60e5e7fd23d7d028fbf73251126ab5672d5ca8b9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs (.../MacroStabilityInwardsFailureMechanismProperties.cs) (revision 2109804607e2c1041dc78167f44c116f0bee45df)
@@ -26,6 +26,7 @@
using Core.Common.Util.Attributes;
using Ringtoets.Common.Data.Probability;
using Ringtoets.MacroStabilityInwards.Data;
+using Ringtoets.MacroStabilityInwards.Forms.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
@@ -40,10 +41,11 @@
private const int groupPropertyIndex = 3;
private const int contributionPropertyIndex = 4;
private const int isRelevantPropertyIndex = 5;
- private const int aPropertyIndex = 6;
- private const int bPropertyIndex = 7;
- private const int sectionLengthPropertyIndex = 8;
- private const int nPropertyIndex = 9;
+ private const int modelFactorPropertyIndex = 6;
+ private const int aPropertyIndex = 7;
+ private const int bPropertyIndex = 8;
+ private const int sectionLengthPropertyIndex = 9;
+ private const int nPropertyIndex = 10;
///
/// Creates a new instance of .
@@ -60,6 +62,23 @@
Data = data;
}
+ #region Model settings
+
+ [DynamicVisible]
+ [PropertyOrder(modelFactorPropertyIndex)]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))]
+ [ResourcesDisplayName(typeof(Resources), nameof(Resources.MacroStabilityInwardsFailureMechanismProperties_ModelFactor_DisplayName))]
+ [ResourcesDescription(typeof(Resources), nameof(Resources.MacroStabilityInwardsFailureMechanismProperties_ModelFactor_Description))]
+ public double ModelFactor
+ {
+ get
+ {
+ return data.GeneralInput.ModelFactor;
+ }
+ }
+
+ #endregion
+
[DynamicVisibleValidationMethod]
public bool DynamicVisibleValidationMethod(string propertyName)
{
@@ -72,7 +91,8 @@
|| nameof(A).Equals(propertyName)
|| nameof(B).Equals(propertyName)
|| nameof(SectionLength).Equals(propertyName)
- || nameof(N).Equals(propertyName);
+ || nameof(N).Equals(propertyName)
+ || nameof(ModelFactor).Equals(propertyName);
}
#region General
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r60e5e7fd23d7d028fbf73251126ab5672d5ca8b9 -r2109804607e2c1041dc78167f44c116f0bee45df
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs) (revision 60e5e7fd23d7d028fbf73251126ab5672d5ca8b9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs) (revision 2109804607e2c1041dc78167f44c116f0bee45df)
@@ -41,10 +41,11 @@
private const int groupPropertyIndex = 2;
private const int contributionPropertyIndex = 3;
private const int isRelevantPropertyIndex = 4;
- private const int aPropertyIndex = 5;
- private const int bPropertyIndex = 6;
- private const int sectionLengthPropertyIndex = 7;
- private const int nPropertyIndex = 8;
+ private const int modelFactorPropertyIndex = 5;
+ private const int aPropertyIndex = 6;
+ private const int bPropertyIndex = 7;
+ private const int sectionLengthPropertyIndex = 8;
+ private const int nPropertyIndex = 9;
[Test]
public void Constructor_DataNull_ThrowArgumentNullException()
@@ -111,6 +112,7 @@
const string generalCategory = "Algemeen";
const string lengthEffectCategory = "Lengte-effect parameters";
+ const string modelSettingsCategory = "Modelinstellingen";
PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(nameProperty,
@@ -147,6 +149,13 @@
"Geeft aan of dit toetsspoor relevant is of niet.",
true);
+ PropertyDescriptor modelFactorProperty = dynamicProperties[modelFactorPropertyIndex];
+ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(modelFactorProperty,
+ generalCategory,
+ "Modelfactor [-]",
+ "Modelfactor die wordt gebruikt bij de berekening van de benaderde faalkans op basis van de berekende stabiliteitsfactor.",
+ true);
+
PropertyDescriptor aProperty = dynamicProperties[aPropertyIndex];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(aProperty,
lengthEffectCategory,
@@ -299,6 +308,7 @@
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.B)));
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.SectionLength)));
Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.N)));
+ Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.ModelFactor)));
Assert.IsTrue(properties.DynamicVisibleValidationMethod(null));
}