Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs (.../MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs (.../MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -108,11 +108,11 @@ } /// - /// Creates the design variable for . + /// Creates the design variable for . /// - public static VariationCoefficientDesignVariable GetPreconsolidationStress(MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine preconsolidationStressUnderSurfaceLine) + public static VariationCoefficientDesignVariable GetPreconsolidationStress(MacroStabilityInwardsPreconsolidationStress preconsolidationStressUnderSurfaceLine) { - return new VariationCoefficientLogNormalDistributionDesignVariable(preconsolidationStressUnderSurfaceLine.PreconsolidationStress) + return new VariationCoefficientLogNormalDistributionDesignVariable(preconsolidationStressUnderSurfaceLine.Stress) { Percentile = 0.05 }; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -95,31 +95,9 @@ layer.Holes.Select(RingToPoints), layer.Properties)).ToArray(); - IEnumerable preconsolidationStressesUnderSurfaceLine = - soilProfile.PreconsolidationStresses.Select(ToPreconsolidationStressUnderSurfaceLine).ToArray(); - - return new MacroStabilityInwardsSoilProfileUnderSurfaceLine(layersUnderSurfaceLine, preconsolidationStressesUnderSurfaceLine); + return new MacroStabilityInwardsSoilProfileUnderSurfaceLine(layersUnderSurfaceLine, soilProfile.PreconsolidationStresses); } - private static MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine ToPreconsolidationStressUnderSurfaceLine( - MacroStabilityInwardsPreconsolidationStress preconsolidationStress) - { - var macroStabilityInwardsPreconsolidationStressUnderSurfaceLine = new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine( - new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine.ConstructionProperties - { - XCoordinate = preconsolidationStress.Location.X, - ZCoordinate = preconsolidationStress.Location.Y, - PreconsolidationStressMean = preconsolidationStress.Stress.Mean, - PreconsolidationStressCoefficientOfVariation = preconsolidationStress.Stress.CoefficientOfVariation - }); - - macroStabilityInwardsPreconsolidationStressUnderSurfaceLine.PreconsolidationStressDesignVariable = - MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(macroStabilityInwardsPreconsolidationStressUnderSurfaceLine) - .GetDesignValue(); - - return macroStabilityInwardsPreconsolidationStressUnderSurfaceLine; - } - private static Point2D[] RingToPoints(Ring ring) { return ring.Points.ToArray(); @@ -139,7 +117,7 @@ } } - return new MacroStabilityInwardsSoilProfileUnderSurfaceLine(collection, Enumerable.Empty()); + return new MacroStabilityInwardsSoilProfileUnderSurfaceLine(collection, Enumerable.Empty()); } private static TempSoilLayerGeometry As2DGeometry(MacroStabilityInwardsSoilLayer1D layer, MacroStabilityInwardsSoilProfile1D soilProfile, double minX, double maxX) Fisheye: Tag bfb81f94181cf21cf73edad591c367969bd22993 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs =================================================================== diff -u -r1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs) (revision 1d6eb4a980508dc55fca5a225fe777c7fd3cbd2e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -36,7 +36,7 @@ /// The preconsolidation stresses defined for the profile. /// Thrown when any parameter is null. public MacroStabilityInwardsSoilProfileUnderSurfaceLine(IEnumerable layers, - IEnumerable preconsolidationStresses) + IEnumerable preconsolidationStresses) { if (layers == null) { @@ -58,6 +58,6 @@ /// /// Gets the preconsolidation stresses in the profile. /// - public IEnumerable PreconsolidationStresses { get; } + public IEnumerable PreconsolidationStresses { get; } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -46,7 +46,6 @@ - Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSoilProfileConverter.cs =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSoilProfileConverter.cs (.../UpliftVanSoilProfileConverter.cs) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSoilProfileConverter.cs (.../UpliftVanSoilProfileConverter.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -99,10 +99,10 @@ } private static IEnumerable ConvertPreconsolidationStresses( - IEnumerable preconsolidationStresses) + IEnumerable preconsolidationStresses) { return preconsolidationStresses.Select(ps => new UpliftVanPreconsolidationStress( - new Point2D(ps.XCoordinate, ps.ZCoordinate), + ps.Location, MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(ps).GetDesignValue())); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs (.../MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs (.../MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -203,19 +203,14 @@ public void GetPreconsolidationStress_ValidPreconsolidationStress_CreateDesignVariableForPreconsolidationStress() { // Setup - var preconsolidationStressUnderSurfaceLine = new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine( - new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine.ConstructionProperties - { - PreconsolidationStressMean = mean, - PreconsolidationStressCoefficientOfVariation = coefficientOfVariation - }); + var preconsolidationStress = new MacroStabilityInwardsPreconsolidationStress(0, 0, mean, coefficientOfVariation); // Call VariationCoefficientDesignVariable preconsoldationStress = - MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(preconsolidationStressUnderSurfaceLine); + MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(preconsolidationStress); // Assert - DistributionAssert.AreEqual(preconsolidationStressUnderSurfaceLine.PreconsolidationStress, preconsoldationStress.Distribution); + DistributionAssert.AreEqual(preconsolidationStress.Stress, preconsoldationStress.Distribution); AssertPercentile(0.05, preconsoldationStress); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -591,32 +591,9 @@ profile, new MacroStabilityInwardsSurfaceLine(string.Empty)); // Assert - MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine[] preconsolidationStressesUnderSurfaceLine = profileUnderSurfaceLine.PreconsolidationStresses.ToArray(); - int expectedNrOfStresses = expectedStresses.Length; - Assert.AreEqual(expectedNrOfStresses, preconsolidationStressesUnderSurfaceLine.Length); - for (var i = 0; i < expectedNrOfStresses; i++) - { - AssertPreconsolidationStress(expectedStresses[i], preconsolidationStressesUnderSurfaceLine[i]); - } + Assert.AreSame(profileUnderSurfaceLine.PreconsolidationStresses, profileUnderSurfaceLine.PreconsolidationStresses); } - private static void AssertPreconsolidationStress(MacroStabilityInwardsPreconsolidationStress preconsolidationStress, - MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine preconsolidationStressUnderSurfaceLine) - { - Assert.AreEqual(preconsolidationStress.Location.X, preconsolidationStressUnderSurfaceLine.XCoordinate); - Assert.AreEqual(preconsolidationStress.Location.Y, preconsolidationStressUnderSurfaceLine.ZCoordinate); - - Assert.AreEqual(preconsolidationStress.Stress.Mean, - preconsolidationStressUnderSurfaceLine.PreconsolidationStress.Mean, - preconsolidationStressUnderSurfaceLine.PreconsolidationStress.GetAccuracy()); - Assert.AreEqual(preconsolidationStress.Stress.CoefficientOfVariation, - preconsolidationStressUnderSurfaceLine.PreconsolidationStress.CoefficientOfVariation, - preconsolidationStressUnderSurfaceLine.PreconsolidationStress.GetAccuracy()); - - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(preconsolidationStressUnderSurfaceLine).GetDesignValue(), - preconsolidationStressUnderSurfaceLine.PreconsolidationStressDesignVariable); - } - private static MacroStabilityInwardsSoilLayer2D GetSoilLayer() { return new MacroStabilityInwardsSoilLayer2D(CreateRing(21), Enumerable.Empty()); Fisheye: Tag bfb81f94181cf21cf73edad591c367969bd22993 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsPreconsolidationStressUnderSurfaceLineTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsSoilProfileUnderSurfaceLineTest.cs =================================================================== diff -u -r503db93944e681654bca87a32e5ed1b8f545c8d9 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsSoilProfileUnderSurfaceLineTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineTest.cs) (revision 503db93944e681654bca87a32e5ed1b8f545c8d9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilUnderSurfaceLine/MacroStabilityInwardsSoilProfileUnderSurfaceLineTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineTest.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -35,7 +35,7 @@ { // Call TestDelegate test = () => new MacroStabilityInwardsSoilProfileUnderSurfaceLine(null, - Enumerable.Empty()); + Enumerable.Empty()); // Assert var exception = Assert.Throws(test); @@ -59,8 +59,8 @@ { // Call IEnumerable layers = Enumerable.Empty(); - IEnumerable preconsolidationStresses = - Enumerable.Empty(); + IEnumerable preconsolidationStresses = + Enumerable.Empty(); // Setup var profile = new MacroStabilityInwardsSoilProfileUnderSurfaceLine(layers, preconsolidationStresses); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -58,7 +58,6 @@ - Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs (.../UpliftVanSoilProfileConverterTest.cs) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSoilProfileConverterTest.cs (.../UpliftVanSoilProfileConverterTest.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -106,13 +106,7 @@ }) }, new[] { - new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine(new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine.ConstructionProperties - { - PreconsolidationStressMean = random.NextDouble(), - PreconsolidationStressCoefficientOfVariation = random.NextDouble(), - XCoordinate = random.NextDouble(), - ZCoordinate = random.NextDouble() - }) + new MacroStabilityInwardsPreconsolidationStress(random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble()) }); // Call @@ -133,10 +127,7 @@ { ShearStrengthModel = (MacroStabilityInwardsShearStrengthModel) 99 }) - }, new[] - { - new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine(new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine.ConstructionProperties()) - }); + }, new MacroStabilityInwardsPreconsolidationStress[0]); // Call TestDelegate test = () => UpliftVanSoilProfileConverter.Convert(profile); @@ -161,10 +152,7 @@ { ShearStrengthModel = originalShearStrengthModel }) - }, new[] - { - new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine(new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine.ConstructionProperties()) - }); + }, new MacroStabilityInwardsPreconsolidationStress[0]); // Call UpliftVanSoilProfile upliftVanSoilProfile = UpliftVanSoilProfileConverter.Convert(profile); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanSoilProfileHelper.cs =================================================================== diff -u -rb1f91c40a335a9e2df70844ddee08b7dc3923259 -rbfb81f94181cf21cf73edad591c367969bd22993 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanSoilProfileHelper.cs (.../UpliftVanSoilProfileHelper.cs) (revision b1f91c40a335a9e2df70844ddee08b7dc3923259) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.TestUtil/UpliftVanSoilProfileHelper.cs (.../UpliftVanSoilProfileHelper.cs) (revision bfb81f94181cf21cf73edad591c367969bd22993) @@ -44,22 +44,21 @@ MacroStabilityInwardsSoilLayerUnderSurfaceLine[] expectedLayers = originSoilProfile.Layers.ToArray(); UpliftVanSoilLayer[] actualLayers = actualSoilProfile.Layers.ToArray(); - MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine[] expectedPreconsolidationStresses = originSoilProfile.PreconsolidationStresses.ToArray(); + MacroStabilityInwardsPreconsolidationStress[] expectedPreconsolidationStresses = originSoilProfile.PreconsolidationStresses.ToArray(); UpliftVanPreconsolidationStress[] actualPreconsolidationStresses = actualSoilProfile.PreconsolidationStresses.ToArray(); AssertLayers(expectedLayers, actualLayers); AssertPreconsolidationStresses(expectedPreconsolidationStresses, actualPreconsolidationStresses); } - private static void AssertPreconsolidationStresses(MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine[] expectedPreconsolidationStresses, + private static void AssertPreconsolidationStresses(MacroStabilityInwardsPreconsolidationStress[] expectedPreconsolidationStresses, UpliftVanPreconsolidationStress[] actualPreconsolidationStresses) { Assert.AreEqual(expectedPreconsolidationStresses.Length, actualPreconsolidationStresses.Length); for (var i = 0; i < expectedPreconsolidationStresses.Length; i++) { Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.GetPreconsolidationStress(expectedPreconsolidationStresses[i]).GetDesignValue(), actualPreconsolidationStresses[i].Stress); - Assert.AreEqual(expectedPreconsolidationStresses[i].XCoordinate, actualPreconsolidationStresses[i].Coordinate.X); - Assert.AreEqual(expectedPreconsolidationStresses[i].ZCoordinate, actualPreconsolidationStresses[i].Coordinate.Y); + Assert.AreEqual(expectedPreconsolidationStresses[i].Location, actualPreconsolidationStresses[i].Coordinate); } }