Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs
===================================================================
diff -u -re0dbdfb3d8e3e614cefb7aa240f92a0fc2309ccc -r53721462b03e2de9b909eda6b07cc24a063ad525
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs (.../GrassCoverErosionOutwardsFailureMechanismProperties.cs) (revision e0dbdfb3d8e3e614cefb7aa240f92a0fc2309ccc)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismProperties.cs (.../GrassCoverErosionOutwardsFailureMechanismProperties.cs) (revision 53721462b03e2de9b909eda6b07cc24a063ad525)
@@ -68,9 +68,6 @@
},
{
nameof(Group), constructionProperties.GroupPropertyIndex
- },
- {
- nameof(Contribution), constructionProperties.ContributionPropertyIndex
}
};
}
@@ -105,11 +102,6 @@
///
public int GroupPropertyIndex { get; set; }
- ///
- /// Gets or sets the property index for .
- ///
- public int ContributionPropertyIndex { get; set; }
-
#endregion
}
@@ -151,18 +143,6 @@
}
}
- [DynamicPropertyOrder]
- [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
- [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))]
- [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))]
- public double Contribution
- {
- get
- {
- return data.Contribution;
- }
- }
-
#endregion
}
}
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs
===================================================================
diff -u -rc66f43287efdd891570d332f0f604e7532444f10 -r53721462b03e2de9b909eda6b07cc24a063ad525
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs (.../GrassCoverErosionOutwardsFailurePathProperties.cs) (revision c66f43287efdd891570d332f0f604e7532444f10)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsFailurePathProperties.cs (.../GrassCoverErosionOutwardsFailurePathProperties.cs) (revision 53721462b03e2de9b909eda6b07cc24a063ad525)
@@ -49,10 +49,25 @@
{
NamePropertyIndex = namePropertyIndex,
CodePropertyIndex = codePropertyIndex,
- GroupPropertyIndex = groupPropertyIndex,
- ContributionPropertyIndex = contributionPropertyIndex
+ GroupPropertyIndex = groupPropertyIndex
}) {}
+ #region General
+
+ [PropertyOrder(contributionPropertyIndex)]
+ [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
+ [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_DisplayName))]
+ [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_Contribution_Description))]
+ public double Contribution
+ {
+ get
+ {
+ return data.Contribution;
+ }
+ }
+
+ #endregion
+
#region Length effect parameters
[PropertyOrder(nPropertyIndex)]
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs
===================================================================
diff -u -re727a4e22432d443b1bd2d24667e1e8c9746d73c -r53721462b03e2de9b909eda6b07cc24a063ad525
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs (.../GrassCoverErosionOutwardsHydraulicLoadsProperties.cs) (revision e727a4e22432d443b1bd2d24667e1e8c9746d73c)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsProperties.cs (.../GrassCoverErosionOutwardsHydraulicLoadsProperties.cs) (revision 53721462b03e2de9b909eda6b07cc24a063ad525)
@@ -38,10 +38,9 @@
private const int namePropertyIndex = 1;
private const int codePropertyIndex = 2;
private const int groupPropertyIndex = 3;
- private const int contributionPropertyIndex = 4;
- private const int waveRunUpPropertyIndex = 5;
- private const int waveImpactPropertyIndex = 6;
- private const int tailorMadeWaveImpactPropertyIndex = 7;
+ private const int waveRunUpPropertyIndex = 4;
+ private const int waveImpactPropertyIndex = 5;
+ private const int tailorMadeWaveImpactPropertyIndex = 6;
///
/// Creates a new instance of .
@@ -53,8 +52,7 @@
{
NamePropertyIndex = namePropertyIndex,
CodePropertyIndex = codePropertyIndex,
- GroupPropertyIndex = groupPropertyIndex,
- ContributionPropertyIndex = contributionPropertyIndex
+ GroupPropertyIndex = groupPropertyIndex
}) {}
#region Model settings
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs
===================================================================
diff -u -re0dbdfb3d8e3e614cefb7aa240f92a0fc2309ccc -r53721462b03e2de9b909eda6b07cc24a063ad525
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision e0dbdfb3d8e3e614cefb7aa240f92a0fc2309ccc)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 53721462b03e2de9b909eda6b07cc24a063ad525)
@@ -32,10 +32,9 @@
[TestFixture]
public class GrassCoverErosionOutwardsFailureMechanismPropertiesTest
{
- private const int namePropertyIndex = 3;
- private const int codePropertyIndex = 2;
- private const int groupPropertyIndex = 1;
- private const int contributionPropertyIndex = 0;
+ private const int namePropertyIndex = 2;
+ private const int codePropertyIndex = 1;
+ private const int groupPropertyIndex = 0;
[Test]
public void Constructor_DataNull_ThrowArgumentNullException()
@@ -73,7 +72,6 @@
Assert.AreEqual(failureMechanism.Name, properties.Name);
Assert.AreEqual(failureMechanism.Code, properties.Code);
Assert.AreEqual(failureMechanism.Group, properties.Group);
- Assert.AreEqual(failureMechanism.Contribution, properties.Contribution);
}
[Test]
@@ -87,13 +85,12 @@
{
NamePropertyIndex = namePropertyIndex,
CodePropertyIndex = codePropertyIndex,
- GroupPropertyIndex = groupPropertyIndex,
- ContributionPropertyIndex = contributionPropertyIndex
+ GroupPropertyIndex = groupPropertyIndex
});
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(4, dynamicProperties.Count);
+ Assert.AreEqual(3, dynamicProperties.Count);
const string generalCategory = "Algemeen";
@@ -117,13 +114,6 @@
"Groep",
"De groep waar het toetsspoor toe behoort.",
true);
-
- PropertyDescriptor contributionProperty = dynamicProperties[contributionPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(contributionProperty,
- generalCategory,
- "Faalkansbijdrage [%]",
- "Procentuele bijdrage van dit toetsspoor aan de totale overstromingskans van het traject.",
- true);
}
}
}
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs
===================================================================
diff -u -re727a4e22432d443b1bd2d24667e1e8c9746d73c -r53721462b03e2de9b909eda6b07cc24a063ad525
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs) (revision e727a4e22432d443b1bd2d24667e1e8c9746d73c)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs (.../GrassCoverErosionOutwardsHydraulicLoadsPropertiesTest.cs) (revision 53721462b03e2de9b909eda6b07cc24a063ad525)
@@ -34,10 +34,9 @@
private const int namePropertyIndex = 0;
private const int codePropertyIndex = 1;
private const int groupPropertyIndex = 2;
- private const int contributionPropertyIndex = 3;
- private const int waveRunUpPropertyIndex = 4;
- private const int waveImpactPropertyIndex = 5;
- private const int tailorMadeWaveImpactPropertyIndex = 6;
+ private const int waveRunUpPropertyIndex = 3;
+ private const int waveImpactPropertyIndex = 4;
+ private const int tailorMadeWaveImpactPropertyIndex = 5;
[Test]
public void Constructor_ExpectedValues()
@@ -54,7 +53,6 @@
Assert.AreEqual(failureMechanism.Name, properties.Name);
Assert.AreEqual(failureMechanism.Code, properties.Code);
Assert.AreEqual(failureMechanism.Group, properties.Group);
- Assert.AreEqual(failureMechanism.Contribution, properties.Contribution);
GeneralGrassCoverErosionOutwardsInput generalInput = failureMechanism.GeneralInput;
Assert.AreSame(generalInput.GeneralWaveRunUpWaveConditionsInput, properties.WaveRunUp.Data);
@@ -70,7 +68,7 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(7, dynamicProperties.Count);
+ Assert.AreEqual(6, dynamicProperties.Count);
const string generalCategory = "Algemeen";
const string modelSettingsCategory = "Modelinstellingen";
@@ -96,13 +94,6 @@
"De groep waar het toetsspoor toe behoort.",
true);
- PropertyDescriptor contributionProperty = dynamicProperties[contributionPropertyIndex];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(contributionProperty,
- generalCategory,
- "Faalkansbijdrage [%]",
- "Procentuele bijdrage van dit toetsspoor aan de totale overstromingskans van het traject.",
- true);
-
PropertyDescriptor waveRunUpProperty = dynamicProperties[waveRunUpPropertyIndex];
Assert.IsInstanceOf(waveRunUpProperty.Converter);
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waveRunUpProperty,