Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r9b0ddd4e6dcb61bdc6482dad639bdbb024f7bf0c -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9b0ddd4e6dcb61bdc6482dad639bdbb024f7bf0c)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -1013,9 +1013,9 @@
///
/// Looks up a localized string similar to {0} (Verwachtingswaarde = {1}, Standaardafwijking = {2}).
///
- public static string DesignVariable_0_Mean_is_1_StandardDeviation_is_2 {
+ public static string DesignVariable_0_Mean_1_StandardDeviation_2 {
get {
- return ResourceManager.GetString("DesignVariable_0_Mean_is_1_StandardDeviation_is_2", resourceCulture);
+ return ResourceManager.GetString("DesignVariable_0_Mean_1_StandardDeviation_2", resourceCulture);
}
}
@@ -3415,9 +3415,9 @@
///
/// Looks up a localized string similar to {0} (Verwachtingswaarde = {1}, Variatiecoëfficiënt = {2}).
///
- public static string VariationCoefficientDesignVariable_0_Mean_is_1_CoefficientOfVariation_is_2 {
+ public static string VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2 {
get {
- return ResourceManager.GetString("VariationCoefficientDesignVariable_0_Mean_is_1_CoefficientOfVariation_is_2", resourceCulture);
+ return ResourceManager.GetString("VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2", resourceCulture);
}
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r9b0ddd4e6dcb61bdc6482dad639bdbb024f7bf0c -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9b0ddd4e6dcb61bdc6482dad639bdbb024f7bf0c)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -1244,10 +1244,10 @@
Rekenwaarde
-
+
{0} (Verwachtingswaarde = {1}, Standaardafwijking = {2})
-
+
{0} (Verwachtingswaarde = {1}, Variatiecoëfficiënt = {2})
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignVariableProperties.cs
===================================================================
diff -u -r3a85bb13c6b7c5c6c90cd0b837e1e09607f29298 -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignVariableProperties.cs (.../DesignVariableProperties.cs) (revision 3a85bb13c6b7c5c6c90cd0b837e1e09607f29298)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/DesignVariableProperties.cs (.../DesignVariableProperties.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -67,7 +67,7 @@
public override string ToString()
{
- return string.Format(Resources.DesignVariable_0_Mean_is_1_StandardDeviation_is_2,
+ return string.Format(Resources.DesignVariable_0_Mean_1_StandardDeviation_2,
DesignValue,
Mean,
StandardDeviation);
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs
===================================================================
diff -u -r3a85bb13c6b7c5c6c90cd0b837e1e09607f29298 -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs (.../VariationCoefficientDesignVariableProperties.cs) (revision 3a85bb13c6b7c5c6c90cd0b837e1e09607f29298)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs (.../VariationCoefficientDesignVariableProperties.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -65,7 +65,7 @@
public override string ToString()
{
- return string.Format(Resources.VariationCoefficientDesignVariable_0_Mean_is_1_CoefficientOfVariation_is_2,
+ return string.Format(Resources.VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2,
DesignValue,
Mean,
CoefficientOfVariation);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilLayer.cs
===================================================================
diff -u -r85b10b88eb31823c50ca052d34baacc6e006ad4c -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilLayer.cs (.../IMacroStabilityInwardsSoilLayer.cs) (revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilLayer.cs (.../IMacroStabilityInwardsSoilLayer.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -22,7 +22,7 @@
namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile
{
///
- /// Interface for the different types of soil layer that can be used in macro stability inwards.
+ /// Interface for the soil layer that can be used in macro stability inwards.
///
public interface IMacroStabilityInwardsSoilLayer
{
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilProfile.cs
===================================================================
diff -u -r85b10b88eb31823c50ca052d34baacc6e006ad4c -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilProfile.cs (.../IMacroStabilityInwardsSoilProfile.cs) (revision 85b10b88eb31823c50ca052d34baacc6e006ad4c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/IMacroStabilityInwardsSoilProfile.cs (.../IMacroStabilityInwardsSoilProfile.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -26,7 +26,7 @@
///
/// Interface for the different types of soil profile that can be used in macro stability inwards.
///
- /// The type of the soil profile.
+ /// The type of the layers in the soil profile.
public interface IMacroStabilityInwardsSoilProfile where T : IMacroStabilityInwardsSoilLayer
{
///
@@ -35,7 +35,7 @@
string Name { get; }
///
- /// Gets an containing the layers of the soil profile.
+ /// Gets the layers of the soil profile.
///
IEnumerable Layers { get; }
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs
===================================================================
diff -u -r3a85bb13c6b7c5c6c90cd0b837e1e09607f29298 -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs) (revision 3a85bb13c6b7c5c6c90cd0b837e1e09607f29298)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -30,7 +30,7 @@
namespace Ringtoets.MacroStabilityInwards.Forms.Views
{
///
- /// This class defines a formatted version of an object.
+ /// This class represents a row of .
///
public class MacroStabilityInwardsFormattedSoilLayerDataRow
{
@@ -62,69 +62,69 @@
}
///
- /// Gets a value indicating whether or not the is an aquifer.
+ /// Gets a value indicating whether the layer is an aquifer.
///
public bool IsAquifer { get; }
///
- /// Gets the name of the material that was assigned to the .
+ /// Gets the material name of the layer.
///
public string MaterialName { get; }
///
- /// Gets the that was used to represent the .
+ /// Gets the color of the layer.
///
public Color Color { get; }
///
- /// Gets the formatted design variable for .
+ /// Gets the above phreatic level of the layer.
///
public string AbovePhreaticLevel { get; }
///
- /// Gets the formatted design variable for .
+ /// Gets the below phreatic level of the layer.
///
public string BelowPhreaticLevel { get; }
///
- /// Gets the type.
+ /// Gets the shear strength model of the layer.
///
[TypeConverter(typeof(EnumTypeConverter))]
public MacroStabilityInwardsShearStrengthModel ShearStrengthModel { get; }
///
- /// Gets the formatted design variable for .
+ /// Gets the cohesion of the layer.
///
public string Cohesion { get; }
///
- /// Gets the formatted design variable for .
+ /// Gets the friction angle of the layer.
///
public string FrictionAngle { get; }
///
- /// Gets the formatted design variable for .
+ /// Gets the shear strength ratio of the layer.
///
public string ShearStrengthRatio { get; }
///
- /// Gets the formatted design variable for .
+ /// Gets the strength increase exponent of the layer.
///
public string StrengthIncreaseExponent { get; }
///
- /// Gets a value indicating whether or not the is using POP.
+ /// Gets a value indicating whether the layer is using POP.
///
public bool UsePop { get; }
///
- /// Gets the formatted design variable for .
+ /// Gets the POP of the layer.
///
public string Pop { get; }
private static string FormatVariationCoefficientDesignVariable(VariationCoefficientDesignVariable designVariable)
{
- return string.Format(RingtoetsCommonFormsResources.VariationCoefficientDesignVariable_0_Mean_is_1_CoefficientOfVariation_is_2,
+ return string.Format(RingtoetsCommonFormsResources.VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2,
designVariable.GetDesignValue(),
designVariable.Distribution.Mean,
designVariable.Distribution.CoefficientOfVariation);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs
===================================================================
diff -u -r9267dd0866494665d58b04b96772fb175626496c -rdbde8403414339f201e9c9250d4931f1d37f1f24
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs) (revision 9267dd0866494665d58b04b96772fb175626496c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
@@ -98,7 +98,6 @@
var formattedSoilLayerDataRow = new MacroStabilityInwardsFormattedSoilLayerDataRow(soilLayerData);
// Assert
-
TestHelper.AssertTypeConverter(
nameof(MacroStabilityInwardsFormattedSoilLayerDataRow.ShearStrengthModel));