Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r33d8b4610b6bc2979e35aa3e23b881a9933e40b5 -r658e6cf9291e16f0896bd44e4a0d03fbe1e46403
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 33d8b4610b6bc2979e35aa3e23b881a9933e40b5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 658e6cf9291e16f0896bd44e4a0d03fbe1e46403)
@@ -445,7 +445,6 @@
-
Fisheye: Tag 658e6cf9291e16f0896bd44e4a0d03fbe1e46403 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/RingXmlSerializer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r33d8b4610b6bc2979e35aa3e23b881a9933e40b5 -r658e6cf9291e16f0896bd44e4a0d03fbe1e46403
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 33d8b4610b6bc2979e35aa3e23b881a9933e40b5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 658e6cf9291e16f0896bd44e4a0d03fbe1e46403)
@@ -176,7 +176,6 @@
-
@@ -298,6 +297,10 @@
{E344867E-9AC9-44C8-88A5-8185681679A9}
Core.Common.IO
+
+ {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}
+ Core.Common.Utils
+
{D749EE4C-CE50-4C17-BF01-9A953028C126}
Core.Common.TestUtil
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs
===================================================================
diff -u -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 -r658e6cf9291e16f0896bd44e4a0d03fbe1e46403
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs) (revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs) (revision 658e6cf9291e16f0896bd44e4a0d03fbe1e46403)
@@ -28,6 +28,7 @@
using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
+using Core.Common.Utils.Extensions;
using NUnit.Framework;
using Ringtoets.Common.Data.Probabilistics;
using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
@@ -140,11 +141,7 @@
outerRingA
}, profile.Layers.Select(l => l.OuterRing));
- CollectionAssert.AreEqual(new[]
- {
- new Ring[0],
- new Ring[0]
- }, profile.Layers.Select(l => l.Holes));
+ profile.Layers.Select(l => l.NestedLayers).ForEachElementDo(CollectionAssert.IsEmpty);
CollectionAssert.AreEqual(new[]
{
Fisheye: Tag 658e6cf9291e16f0896bd44e4a0d03fbe1e46403 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Serializers/RingXmlSerializerTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -rf6dd19ee061fc2754d81eb3677c26fbdb504fc49 -r658e6cf9291e16f0896bd44e4a0d03fbe1e46403
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision f6dd19ee061fc2754d81eb3677c26fbdb504fc49)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 658e6cf9291e16f0896bd44e4a0d03fbe1e46403)
@@ -1119,92 +1119,80 @@
soilLayer1D
});
- var soilLayer2D = new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
- {
- new Point2D(0, 0),
- new Point2D(1, 1)
- }), new[]
- {
+ var soilLayer2D = new MacroStabilityInwardsSoilLayer2D(
new Ring(new[]
{
- new Point2D(2, 2),
- new Point2D(3, 3)
- })
- }, new MacroStabilityInwardsSoilLayerData(), new[]
- {
- new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
+ new Point2D(0, 0),
+ new Point2D(1, 1)
+ }), new Ring[0],
+ new MacroStabilityInwardsSoilLayerData(), new[]
{
- new Point2D(3, 3),
- new Point2D(4, 4)
- }), new[]
- {
- new Ring(new[]
+ new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
{
- new Point2D(5, 5),
- new Point2D(6, 6)
- })
- })
- {
- Data =
+ new Point2D(3, 3),
+ new Point2D(4, 4)
+ }), new Ring[0])
{
- IsAquifer = true,
- MaterialName = "Navy",
- Color = Color.Navy,
- UsePop = true,
- ShearStrengthModel = MacroStabilityInwardsShearStrengthModel.CPhi,
- AbovePhreaticLevel = new VariationCoefficientLogNormalDistribution
+ Data =
{
- Mean = (RoundedDouble) 15.901,
- CoefficientOfVariation = (RoundedDouble) 5.902,
- Shift = (RoundedDouble) 5.903
- },
- BelowPhreaticLevel = new VariationCoefficientLogNormalDistribution
+ IsAquifer = true,
+ MaterialName = "Navy",
+ Color = Color.Navy,
+ UsePop = true,
+ ShearStrengthModel = MacroStabilityInwardsShearStrengthModel.CPhi,
+ AbovePhreaticLevel = new VariationCoefficientLogNormalDistribution
+ {
+ Mean = (RoundedDouble) 15.901,
+ CoefficientOfVariation = (RoundedDouble) 5.902,
+ Shift = (RoundedDouble) 5.903
+ },
+ BelowPhreaticLevel = new VariationCoefficientLogNormalDistribution
+ {
+ Mean = (RoundedDouble) 5.906,
+ CoefficientOfVariation = (RoundedDouble) 5.905,
+ Shift = (RoundedDouble) 5.904
+ },
+ Cohesion = new VariationCoefficientLogNormalDistribution
+ {
+ Mean = (RoundedDouble) 5.907,
+ CoefficientOfVariation = (RoundedDouble) 5.908
+ },
+ FrictionAngle = new VariationCoefficientLogNormalDistribution
+ {
+ Mean = (RoundedDouble) 5.909,
+ CoefficientOfVariation = (RoundedDouble) 5.91
+ },
+ ShearStrengthRatio = new VariationCoefficientLogNormalDistribution
+ {
+ Mean = (RoundedDouble) 5.911,
+ CoefficientOfVariation = (RoundedDouble) 5.912
+ },
+ StrengthIncreaseExponent = new VariationCoefficientLogNormalDistribution
+ {
+ Mean = (RoundedDouble) 5.913,
+ CoefficientOfVariation = (RoundedDouble) 5.914
+ },
+ Pop = new VariationCoefficientLogNormalDistribution
+ {
+ Mean = (RoundedDouble) 5.915,
+ CoefficientOfVariation = (RoundedDouble) 5.916
+ }
+ }
+ },
+ new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
+ {
+ new Point2D(-10, -100),
+ new Point2D(10, 100)
+ }), new Ring[0])
+ {
+ Data =
{
- Mean = (RoundedDouble) 5.906,
- CoefficientOfVariation = (RoundedDouble) 5.905,
- Shift = (RoundedDouble) 5.904
- },
- Cohesion = new VariationCoefficientLogNormalDistribution
- {
- Mean = (RoundedDouble) 5.907,
- CoefficientOfVariation = (RoundedDouble) 5.908
- },
- FrictionAngle = new VariationCoefficientLogNormalDistribution
- {
- Mean = (RoundedDouble) 5.909,
- CoefficientOfVariation = (RoundedDouble) 5.91
- },
- ShearStrengthRatio = new VariationCoefficientLogNormalDistribution
- {
- Mean = (RoundedDouble) 5.911,
- CoefficientOfVariation = (RoundedDouble) 5.912
- },
- StrengthIncreaseExponent = new VariationCoefficientLogNormalDistribution
- {
- Mean = (RoundedDouble) 5.913,
- CoefficientOfVariation = (RoundedDouble) 5.914
- },
- Pop = new VariationCoefficientLogNormalDistribution
- {
- Mean = (RoundedDouble) 5.915,
- CoefficientOfVariation = (RoundedDouble) 5.916
+ MaterialName = "HotPink",
+ Color = Color.HotPink,
+ ShearStrengthModel = MacroStabilityInwardsShearStrengthModel.SuCalculated
}
}
- },
- new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
- {
- new Point2D(-10, -100),
- new Point2D(10, 100)
- }), new Ring[0])
- {
- Data =
- {
- MaterialName = "HotPink",
- Color = Color.HotPink,
- ShearStrengthModel = MacroStabilityInwardsShearStrengthModel.SuCalculated
- }
- }
- })
+ })
{
Data =
{