Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableSoilCollectionFactory.cs =================================================================== diff -u -rb9ceec3c71d972d3d467c1520033ac48cf77b2e9 -rd532a0de6040cbaf0d6c01c37697c9ecc40e5166 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableSoilCollectionFactory.cs (.../PersistableSoilCollectionFactory.cs) (revision b9ceec3c71d972d3d467c1520033ac48cf77b2e9) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.IO/Factories/PersistableSoilCollectionFactory.cs (.../PersistableSoilCollectionFactory.cs) (revision d532a0de6040cbaf0d6c01c37697c9ecc40e5166) @@ -100,7 +100,7 @@ ShearStrengthRatio = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetShearStrengthRatio(layerData).GetDesignValue(), ShearStrengthRatioStochasticParameter = PersistableStochasticParameterFactory.Create(layerData.ShearStrengthRatio), StrengthIncreaseExponent = MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetStrengthIncreaseExponent(layerData).GetDesignValue(), - StrengthIncreaseExponentStochasticParameter = PersistableStochasticParameterFactory.Create(layerData.ShearStrengthRatio), + StrengthIncreaseExponentStochasticParameter = PersistableStochasticParameterFactory.Create(layerData.StrengthIncreaseExponent), CohesionAndFrictionAngleCorrelated = false, ShearStrengthRatioAndShearStrengthExponentCorrelated = false, ShearStrengthModelTypeAbovePhreaticLevel = GetShearStrengthModelTypeForAbovePhreaticLevel(layerData.ShearStrengthModel), Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rd532a0de6040cbaf0d6c01c37697c9ecc40e5166 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs (.../MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs (.../MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs) (revision d532a0de6040cbaf0d6c01c37697c9ecc40e5166) @@ -32,14 +32,14 @@ public class MacroStabilityInwardsCalculationScenarioTestFactoryTest { [Test] - public void CreateMacroStabilityInwardsCalculationScenariot_SectionNull_ThrowsArgumentNullException() + public void CreateMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(null); + void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("section", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("section", exception.ParamName); } [Test] @@ -65,14 +65,14 @@ } [Test] - public void CreateMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException() + public void CreateMacroStabilityInwardsCalculationScenarioWithFactorOfStability_SectionNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(double.NaN, null); + void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(double.NaN, null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("section", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("section", exception.ParamName); } [Test] @@ -98,11 +98,11 @@ public void CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput_SectionNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(null); + void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("section", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("section", exception.ParamName); } [Test] @@ -124,11 +124,11 @@ public void CreateIrrelevantMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(null); + void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("section", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("section", exception.ParamName); } [Test] @@ -150,11 +150,11 @@ public void CreateNotCalculatedMacroStabilityInwardsCalculationScenario_SectionNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(null); + void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("section", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("section", exception.ParamName); } [Test] @@ -182,14 +182,14 @@ } [Test] - public void CreateMacroStabilityInwardsCalculationScenarioWithValidInput_HydraulicBoundaryLocationNull_ThrowsArgumentnullException() + public void CreateMacroStabilityInwardsCalculationScenarioWithValidInput_HydraulicBoundaryLocationNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(null); + void Call() => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(null); // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("hydraulicBoundaryLocation", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("hydraulicBoundaryLocation", exception.ParamName); } [Test] Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rd532a0de6040cbaf0d6c01c37697c9ecc40e5166 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs (.../MacroStabilityInwardsCalculationScenarioTestFactory.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs (.../MacroStabilityInwardsCalculationScenarioTestFactory.cs) (revision d532a0de6040cbaf0d6c01c37697c9ecc40e5166) @@ -176,6 +176,21 @@ Mean = (RoundedDouble) 15, CoefficientOfVariation = (RoundedDouble) 0.5, Shift = (RoundedDouble) 0.2 + }, + ShearStrengthRatio = + { + Mean = (RoundedDouble) 0.1, + CoefficientOfVariation = (RoundedDouble) 0.2 + }, + Pop = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.4 + }, + StrengthIncreaseExponent = + { + Mean = (RoundedDouble) 0.5, + CoefficientOfVariation = (RoundedDouble) 0.6 } } }, @@ -198,6 +213,21 @@ Mean = (RoundedDouble) 15, CoefficientOfVariation = (RoundedDouble) 0.5, Shift = (RoundedDouble) 0.2 + }, + ShearStrengthRatio = + { + Mean = (RoundedDouble) 0.1, + CoefficientOfVariation = (RoundedDouble) 0.2 + }, + Pop = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.4 + }, + StrengthIncreaseExponent = + { + Mean = (RoundedDouble) 0.5, + CoefficientOfVariation = (RoundedDouble) 0.6 } } }, @@ -220,6 +250,21 @@ Mean = (RoundedDouble) 15, CoefficientOfVariation = (RoundedDouble) 0.5, Shift = (RoundedDouble) 0.2 + }, + ShearStrengthRatio = + { + Mean = (RoundedDouble) 0.1, + CoefficientOfVariation = (RoundedDouble) 0.2 + }, + Pop = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.4 + }, + StrengthIncreaseExponent = + { + Mean = (RoundedDouble) 0.5, + CoefficientOfVariation = (RoundedDouble) 0.6 } } }