Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rdbde8403414339f201e9c9250d4931f1d37f1f24 -rc16bf14238e7817258f0fa8d5304e0d0e1ae22be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c16bf14238e7817258f0fa8d5304e0d0e1ae22be)
@@ -3422,6 +3422,15 @@
}
///
+ /// Looks up a localized string similar to {0} (Verwachtingswaarde = {1}, Variatiecoëfficiënt = {2}, Verschuiving = {3}).
+ ///
+ public static string VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2_Shift_3 {
+ get {
+ return ResourceManager.GetString("VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2_Shift_3", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Als u kiest voor bijwerken, dan wordt het resultaat van deze berekening verwijderd.
///
///Weet u zeker dat u wilt doorgaan?.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rdbde8403414339f201e9c9250d4931f1d37f1f24 -rc16bf14238e7817258f0fa8d5304e0d0e1ae22be
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision c16bf14238e7817258f0fa8d5304e0d0e1ae22be)
@@ -1250,4 +1250,7 @@
{0} (Verwachtingswaarde = {1}, Variatiecoëfficiënt = {2})
+
+ {0} (Verwachtingswaarde = {1}, Variatiecoëfficiënt = {2}, Verschuiving = {3})
+
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs
===================================================================
diff -u -rdbde8403414339f201e9c9250d4931f1d37f1f24 -rc16bf14238e7817258f0fa8d5304e0d0e1ae22be
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFormattedSoilLayerDataRow.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRow.cs) (revision c16bf14238e7817258f0fa8d5304e0d0e1ae22be)
@@ -50,8 +50,8 @@
MaterialName = layerData.MaterialName;
Color = layerData.Color;
IsAquifer = layerData.IsAquifer;
- AbovePhreaticLevel = FormatVariationCoefficientDesignVariable(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(layerData));
- BelowPhreaticLevel = FormatVariationCoefficientDesignVariable(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(layerData));
+ AbovePhreaticLevel = FormatVariationCoefficientDesignVariableWithShift(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetAbovePhreaticLevel(layerData));
+ BelowPhreaticLevel = FormatVariationCoefficientDesignVariableWithShift(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetBelowPhreaticLevel(layerData));
ShearStrengthModel = layerData.ShearStrengthModel;
Cohesion = FormatVariationCoefficientDesignVariable(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetCohesion(layerData));
FrictionAngle = FormatVariationCoefficientDesignVariable(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetFrictionAngle(layerData));
@@ -129,5 +129,14 @@
designVariable.Distribution.Mean,
designVariable.Distribution.CoefficientOfVariation);
}
+
+ private static string FormatVariationCoefficientDesignVariableWithShift(VariationCoefficientDesignVariable designVariable)
+ {
+ return string.Format(RingtoetsCommonFormsResources.VariationCoefficientDesignVariable_0_Mean_1_CoefficientOfVariation_2_Shift_3,
+ designVariable.GetDesignValue(),
+ designVariable.Distribution.Mean,
+ designVariable.Distribution.CoefficientOfVariation,
+ designVariable.Distribution.Shift);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs
===================================================================
diff -u -rdbde8403414339f201e9c9250d4931f1d37f1f24 -rc16bf14238e7817258f0fa8d5304e0d0e1ae22be
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs) (revision dbde8403414339f201e9c9250d4931f1d37f1f24)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs (.../MacroStabilityInwardsFormattedSoilLayerDataRowTest.cs) (revision c16bf14238e7817258f0fa8d5304e0d0e1ae22be)
@@ -58,12 +58,14 @@
AbovePhreaticLevel = new VariationCoefficientLogNormalDistribution
{
CoefficientOfVariation = (RoundedDouble) 1.0,
- Mean = (RoundedDouble) 1.0
+ Mean = (RoundedDouble) 1.0,
+ Shift = (RoundedDouble) 0.5
},
BelowPhreaticLevel = new VariationCoefficientLogNormalDistribution
{
CoefficientOfVariation = (RoundedDouble) 2.0,
- Mean = (RoundedDouble) 2.0
+ Mean = (RoundedDouble) 2.0,
+ Shift = (RoundedDouble) 1.0
},
ShearStrengthModel = MacroStabilityInwardsShearStrengthModel.CPhi,
ShearStrengthRatio = new VariationCoefficientLogNormalDistribution
@@ -104,8 +106,8 @@
Assert.AreEqual(soilLayerData.MaterialName, formattedSoilLayerDataRow.MaterialName);
Assert.AreEqual(soilLayerData.Color, formattedSoilLayerDataRow.Color);
Assert.AreEqual(soilLayerData.IsAquifer, formattedSoilLayerDataRow.IsAquifer);
- Assert.AreEqual("0,71 (Verwachtingswaarde = 1,00, Variatiecoëfficiënt = 1,00)", formattedSoilLayerDataRow.AbovePhreaticLevel);
- Assert.AreEqual("0,89 (Verwachtingswaarde = 2,00, Variatiecoëfficiënt = 2,00)", formattedSoilLayerDataRow.BelowPhreaticLevel);
+ Assert.AreEqual("0,85 (Verwachtingswaarde = 1,00, Variatiecoëfficiënt = 1,00, Verschuiving = 0,50)", formattedSoilLayerDataRow.AbovePhreaticLevel);
+ Assert.AreEqual("1,45 (Verwachtingswaarde = 2,00, Variatiecoëfficiënt = 2,00, Verschuiving = 1,00)", formattedSoilLayerDataRow.BelowPhreaticLevel);
Assert.AreEqual(soilLayerData.ShearStrengthModel, formattedSoilLayerDataRow.ShearStrengthModel);
Assert.AreEqual("0,08 (Verwachtingswaarde = 3,00, Variatiecoëfficiënt = 3,00)", formattedSoilLayerDataRow.ShearStrengthRatio);
Assert.AreEqual("0,06 (Verwachtingswaarde = 4,00, Variatiecoëfficiënt = 4,00)", formattedSoilLayerDataRow.Cohesion);