Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs
===================================================================
diff -u -r4abb9905e5c81445217060c7394966acf6a7c0d3 -r8f603e2036a1d07da2dfd2288f9de86abccb2e55
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs) (revision 4abb9905e5c81445217060c7394966acf6a7c0d3)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55)
@@ -88,7 +88,6 @@
new MacroStabilityInwardsPreconsolidationStress(random.NextDouble(),
random.NextDouble(),
random.NextDouble(),
- random.NextDouble(),
random.NextDouble())
};
@@ -156,7 +155,6 @@
new MacroStabilityInwardsPreconsolidationStress(random.NextDouble(),
random.NextDouble(),
random.NextDouble(),
- random.NextDouble(),
random.NextDouble())
};
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPreconsolidationStress.cs
===================================================================
diff -u -red2f1cb6668ebc525c0d537db0e68db8f2bc65bc -r8f603e2036a1d07da2dfd2288f9de86abccb2e55
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPreconsolidationStress.cs (.../MacroStabilityInwardsPreconsolidationStress.cs) (revision ed2f1cb6668ebc525c0d537db0e68db8f2bc65bc)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPreconsolidationStress.cs (.../MacroStabilityInwardsPreconsolidationStress.cs) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55)
@@ -36,29 +36,24 @@
/// The x coordinate of the preconsolidation stress location.
/// The z coordinate of the preconsolidation stress location.
/// The mean of the stochastic distribution
- /// for the preconsolidation stress.
+ /// for the preconsolidation stress.
/// The coefficient of
- /// variation of the stochastic distribution for the preconsolidation stress.
- /// The shift of the stochastic distribution
- /// for the preconsolidation stress
+ /// variation of the stochastic distribution for the preconsolidation stress.
/// Thrown when any of the parameters has an invalid value.
public MacroStabilityInwardsPreconsolidationStress(double xCoordinate,
double zCoordinate,
double preconsolidationStressMean,
- double preconsolidationStressCoefficientOfVariation,
- double preconsolidationStressShift)
+ double preconsolidationStressCoefficientOfVariation)
{
ValidateParameter(xCoordinate, Resources.MacroStabilityInwardsPreconsolidationStress_XCoordinate_ParameterName);
ValidateParameter(zCoordinate, Resources.MacroStabilityInwardsPreconsolidationStress_ZCoordinate_ParameterName);
ValidateParameter(preconsolidationStressMean, Resources.MacroStabilityInwardsPreconsolidationStress_PreconsolidationStressMean_ParameterName);
ValidateParameter(preconsolidationStressCoefficientOfVariation, Resources.MacroStabilityInwardsPreconsolidationStress_PreconsolidationStressCoefficientOfVariation_ParameterName);
- ValidateParameter(preconsolidationStressShift, Resources.MacroStabilityInwardsPreconsolidationStress_PreconsolidationStressShift_ParameterName);
XCoordinate = xCoordinate;
ZCoordinate = zCoordinate;
PreconsolidationStressMean = preconsolidationStressMean;
PreconsolidationStressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation;
- PreconsolidationStressShift = preconsolidationStressShift;
}
///
@@ -86,12 +81,6 @@
public double PreconsolidationStressCoefficientOfVariation { get; }
///
- /// Gets the value representing the shift of the distribution for the preconsolidation stress.
- /// [kN/m�]
- ///
- public double PreconsolidationStressShift { get; }
-
- ///
/// Validates if the is a valid value.
///
/// The value to validate.
@@ -128,8 +117,7 @@
return XCoordinate.Equals(other.XCoordinate)
&& ZCoordinate.Equals(other.ZCoordinate)
&& PreconsolidationStressMean.Equals(other.PreconsolidationStressMean)
- && PreconsolidationStressCoefficientOfVariation.Equals(other.PreconsolidationStressCoefficientOfVariation)
- && PreconsolidationStressShift.Equals(other.PreconsolidationStressShift);
+ && PreconsolidationStressCoefficientOfVariation.Equals(other.PreconsolidationStressCoefficientOfVariation);
}
public override int GetHashCode()
@@ -140,7 +128,6 @@
hashCode = (hashCode * 397) ^ ZCoordinate.GetHashCode();
hashCode = (hashCode * 397) ^ PreconsolidationStressMean.GetHashCode();
hashCode = (hashCode * 397) ^ PreconsolidationStressCoefficientOfVariation.GetHashCode();
- hashCode = (hashCode * 397) ^ PreconsolidationStressShift.GetHashCode();
return hashCode;
}
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs
===================================================================
diff -u -red2f1cb6668ebc525c0d537db0e68db8f2bc65bc -r8f603e2036a1d07da2dfd2288f9de86abccb2e55
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ed2f1cb6668ebc525c0d537db0e68db8f2bc65bc)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55)
@@ -129,16 +129,6 @@
}
///
- /// Looks up a localized string similar to verschuiving.
- ///
- public static string MacroStabilityInwardsPreconsolidationStress_PreconsolidationStressShift_ParameterName {
- get {
- return ResourceManager.GetString("MacroStabilityInwardsPreconsolidationStress_PreconsolidationStressShift_Parameter" +
- "Name", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to De waarde voor '{0}' moet een concreet getal zijn..
///
public static string MacroStabilityInwardsPreconsolidationStress_ValidateParameter_The_value_of_ParameterName_0_must_be_a_concrete_value {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx
===================================================================
diff -u -red2f1cb6668ebc525c0d537db0e68db8f2bc65bc -r8f603e2036a1d07da2dfd2288f9de86abccb2e55
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx (.../Resources.resx) (revision ed2f1cb6668ebc525c0d537db0e68db8f2bc65bc)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Properties/Resources.resx (.../Resources.resx) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55)
@@ -150,7 +150,4 @@
variatiecoëfficient
-
- verschuiving
-
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs
===================================================================
diff -u -r35bb3fb2239c0f3633155ccea59b2b3bad28f52d -r8f603e2036a1d07da2dfd2288f9de86abccb2e55
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision 35bb3fb2239c0f3633155ccea59b2b3bad28f52d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55)
@@ -686,12 +686,10 @@
new MacroStabilityInwardsPreconsolidationStress(random.NextDouble(),
random.NextDouble(),
random.NextDouble(),
- random.NextDouble(),
random.NextDouble()),
new MacroStabilityInwardsPreconsolidationStress(random.NextDouble(),
random.NextDouble(),
random.NextDouble(),
- random.NextDouble(),
random.NextDouble())
};
yield return new TestCaseData(preconsolidationStresses)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPreconsolidationStressTest.cs
===================================================================
diff -u -red2f1cb6668ebc525c0d537db0e68db8f2bc65bc -r8f603e2036a1d07da2dfd2288f9de86abccb2e55
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPreconsolidationStressTest.cs (.../MacroStabilityInwardsPreconsolidationStressTest.cs) (revision ed2f1cb6668ebc525c0d537db0e68db8f2bc65bc)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPreconsolidationStressTest.cs (.../MacroStabilityInwardsPreconsolidationStressTest.cs) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55)
@@ -39,21 +39,18 @@
double zCoordinate = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
- double stressShift = random.NextDouble();
// Call
var stress = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
// Assert
Assert.AreEqual(xCoordinate, stress.XCoordinate);
Assert.AreEqual(zCoordinate, stress.ZCoordinate);
Assert.AreEqual(stressMean, stress.PreconsolidationStressMean);
Assert.AreEqual(stressCoefficientOfVariation, stress.PreconsolidationStressCoefficientOfVariation);
- Assert.AreEqual(stressShift, stress.PreconsolidationStressShift);
}
[Test]
@@ -62,15 +59,13 @@
double zCoordinate,
double stressMean,
double stressCoefficientOfVariation,
- double stressShift,
string parameterName)
{
// Call
TestDelegate call = () => new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
// Assert
string expectedMessage = $"De waarde voor '{parameterName}' moet een concreet getal zijn.";
@@ -85,15 +80,13 @@
double xCoordinate = random.NextDouble();
double zCoordinate = random.NextDouble();
- double stressShift = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
var stress = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
// Call
bool result = stress.Equals(null);
@@ -110,15 +103,13 @@
double xCoordinate = random.NextDouble();
double zCoordinate = random.NextDouble();
- double stressShift = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
var stress = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
MacroStabilityInwardsPreconsolidationStress sameStress = stress;
@@ -139,15 +130,13 @@
double xCoordinate = random.NextDouble();
double zCoordinate = random.NextDouble();
- double stressShift = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
var stress = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
// Call
bool result = stress.Equals(new object());
@@ -164,21 +153,18 @@
double xCoordinate = random.NextDouble();
double zCoordinate = random.NextDouble();
- double stressShift = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
var stress = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
var derivedStress = new DerivedMacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
// Call
bool result = stress.Equals(derivedStress);
@@ -195,21 +181,18 @@
double xCoordinate = random.NextDouble();
double zCoordinate = random.NextDouble();
- double stressShift = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
var stressA = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
var stressB = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
// Call
bool isStressAEqualToB = stressA.Equals(stressB);
@@ -242,21 +225,18 @@
double xCoordinate = random.NextDouble();
double zCoordinate = random.NextDouble();
- double stressShift = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
var stressA = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
var stressB = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
// Call
int hashCodeStressA = stressA.GetHashCode();
@@ -272,51 +252,38 @@
double xCoordinate = random.NextDouble();
double zCoordinate = random.NextDouble();
- double stressShift = random.NextDouble();
double stressMean = random.NextDouble();
double stressCoefficientOfVariation = random.NextDouble();
var baseStress = new MacroStabilityInwardsPreconsolidationStress(xCoordinate,
zCoordinate,
stressMean,
- stressCoefficientOfVariation,
- stressShift);
+ stressCoefficientOfVariation);
yield return new TestCaseData(baseStress,
new MacroStabilityInwardsPreconsolidationStress(baseStress.XCoordinate + random.NextDouble(),
baseStress.ZCoordinate,
baseStress.PreconsolidationStressMean,
- baseStress.PreconsolidationStressCoefficientOfVariation,
- baseStress.PreconsolidationStressShift))
+ baseStress.PreconsolidationStressCoefficientOfVariation))
.SetName("Different X Coordinate");
yield return new TestCaseData(baseStress,
new MacroStabilityInwardsPreconsolidationStress(baseStress.XCoordinate,
baseStress.ZCoordinate + random.NextDouble(),
baseStress.PreconsolidationStressMean,
- baseStress.PreconsolidationStressCoefficientOfVariation,
- baseStress.PreconsolidationStressShift))
+ baseStress.PreconsolidationStressCoefficientOfVariation))
.SetName("Different Z Coordinate");
yield return new TestCaseData(baseStress,
new MacroStabilityInwardsPreconsolidationStress(baseStress.XCoordinate,
baseStress.ZCoordinate,
baseStress.PreconsolidationStressMean + random.NextDouble(),
- baseStress.PreconsolidationStressCoefficientOfVariation,
- baseStress.PreconsolidationStressShift))
+ baseStress.PreconsolidationStressCoefficientOfVariation))
.SetName("Different Mean");
yield return new TestCaseData(baseStress,
new MacroStabilityInwardsPreconsolidationStress(baseStress.XCoordinate,
baseStress.ZCoordinate,
baseStress.PreconsolidationStressMean,
- baseStress.PreconsolidationStressCoefficientOfVariation + random.NextDouble(),
- baseStress.PreconsolidationStressShift))
+ baseStress.PreconsolidationStressCoefficientOfVariation + random.NextDouble()))
.SetName("Different Coefficient of Variation");
- yield return new TestCaseData(baseStress,
- new MacroStabilityInwardsPreconsolidationStress(baseStress.XCoordinate,
- baseStress.ZCoordinate,
- baseStress.PreconsolidationStressMean,
- baseStress.PreconsolidationStressCoefficientOfVariation,
- baseStress.PreconsolidationStressShift + random.NextDouble()))
- .SetName("Different Shift");
}
private static IEnumerable GetInvalidConstructorArguments()
@@ -329,21 +296,19 @@
double stressCoefficientOfVariation = random.NextDouble();
double stressShift = random.NextDouble();
- yield return new TestCaseData(double.NaN, zCoordinate, stressMean, stressCoefficientOfVariation, stressShift, "X-coördinaat").SetName("Invalid XCoordinate");
- yield return new TestCaseData(xCoordinate, double.NaN, stressMean, stressCoefficientOfVariation, stressShift, "Z-coördinaat").SetName("Invalid ZCoordinate");
- yield return new TestCaseData(xCoordinate, zCoordinate, double.NaN, stressCoefficientOfVariation, stressShift, "gemiddelde").SetName("Invalid Mean");
- yield return new TestCaseData(xCoordinate, zCoordinate, stressMean, double.NaN, stressShift, "variatiecoëfficient").SetName("Invalid Coefficient of Variation");
- yield return new TestCaseData(xCoordinate, zCoordinate, stressMean, stressCoefficientOfVariation, double.NaN, "verschuiving").SetName("Invalid Shift");
+ yield return new TestCaseData(double.NaN, zCoordinate, stressMean, stressCoefficientOfVariation, "X-coördinaat").SetName("Invalid XCoordinate");
+ yield return new TestCaseData(xCoordinate, double.NaN, stressMean, stressCoefficientOfVariation, "Z-coördinaat").SetName("Invalid ZCoordinate");
+ yield return new TestCaseData(xCoordinate, zCoordinate, double.NaN, stressCoefficientOfVariation, "gemiddelde").SetName("Invalid Mean");
+ yield return new TestCaseData(xCoordinate, zCoordinate, stressMean, double.NaN, "variatiecoëfficient").SetName("Invalid Coefficient of Variation");
}
private class DerivedMacroStabilityInwardsPreconsolidationStress : MacroStabilityInwardsPreconsolidationStress
{
public DerivedMacroStabilityInwardsPreconsolidationStress(double xCoordinate,
double zCoordinate,
double preconsolidationStressMean,
- double preconsolidationStressCoefficientOfVariation,
- double preconsolidationStressShift)
- : base(xCoordinate, zCoordinate, preconsolidationStressMean, preconsolidationStressCoefficientOfVariation, preconsolidationStressShift) {}
+ double preconsolidationStressCoefficientOfVariation)
+ : base(xCoordinate, zCoordinate, preconsolidationStressMean, preconsolidationStressCoefficientOfVariation) {}
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilProfile2DTest.cs
===================================================================
diff -u -r88b34bd91c9f2cf430183a00e9df15f22e2863ff -r8f603e2036a1d07da2dfd2288f9de86abccb2e55
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilProfile2DTest.cs (.../MacroStabilityInwardsSoilProfile2DTest.cs) (revision 88b34bd91c9f2cf430183a00e9df15f22e2863ff)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilProfile2DTest.cs (.../MacroStabilityInwardsSoilProfile2DTest.cs) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55)
@@ -324,7 +324,6 @@
return new MacroStabilityInwardsPreconsolidationStress(random.NextDouble(),
random.NextDouble(),
random.NextDouble(),
- random.NextDouble(),
random.NextDouble());
}