Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -50,7 +50,7 @@ using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; -using MacroStabilityInwardsStochasticSoilModel = Ringtoets.MacroStabilityInwards.Data.StochasticSoilModel; +using MacroStabilityInwardsStochasticSoilModel = Ringtoets.MacroStabilityInwards.Data.SoilProfile.StochasticSoilModel; namespace Ringtoets.Integration.Service.Test { Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataImportHelper.cs (.../DataImportHelper.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -38,6 +38,7 @@ using Ringtoets.Integration.Data; using Ringtoets.Integration.Plugin.Handlers; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; using Ringtoets.MacroStabilityInwards.Primitives; @@ -261,7 +262,7 @@ } /// - /// Imports the data for the + /// Imports the data for the /// of the given . /// /// The to import on. Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataUpdateHelper.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataUpdateHelper.cs (.../DataUpdateHelper.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/DataUpdateHelper.cs (.../DataUpdateHelper.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,6 +26,7 @@ using Ringtoets.Common.IO.FileImporters.MessageProviders; using Ringtoets.Common.IO.SoilProfile; using Ringtoets.Integration.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; using Ringtoets.Piping.Data; @@ -68,7 +69,7 @@ } /// - /// Imports the data for the + /// Imports the data for the /// of the given and updates existing data based upon the imported /// data. /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsDikeSoilScenario.cs =================================================================== diff -u -r71f7d8eb825900614f79772077339efaa60ef75a -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsDikeSoilScenario.cs (.../MacroStabilityInwardsDikeSoilScenario.cs) (revision 71f7d8eb825900614f79772077339efaa60ef75a) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsDikeSoilScenario.cs (.../MacroStabilityInwardsDikeSoilScenario.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -31,10 +31,13 @@ { [ResourcesDisplayName(typeof(Resources), nameof(Resources.ClayDikeOnClay_DisplayName))] ClayDikeOnClay = 1, + [ResourcesDisplayName(typeof(Resources), nameof(Resources.SandDikeOnClay_DisplayName))] SandDikeOnClay = 2, + [ResourcesDisplayName(typeof(Resources), nameof(Resources.ClayDikeOnSand_DisplayName))] ClayDikeOnSand = 3, + [ResourcesDisplayName(typeof(Resources), nameof(Resources.SandDikeOnSand_DisplayName))] SandDikeOnSand = 4 } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -23,6 +23,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.MacroStabilityInwards.Data.Properties; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Data Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsGridDetermination.cs =================================================================== diff -u -r214c28d886591428bbdaa6e06a57efe2fe06dc07 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsGridDetermination.cs (.../MacroStabilityInwardsGridDetermination.cs) (revision 214c28d886591428bbdaa6e06a57efe2fe06dc07) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsGridDetermination.cs (.../MacroStabilityInwardsGridDetermination.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -31,6 +31,7 @@ { [ResourcesDisplayName(typeof(Resources), nameof(Resources.Automatic_DisplayName))] Automatic = 1, + [ResourcesDisplayName(typeof(Resources), nameof(Resources.Manual_DisplayName))] Manual = 2 } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs =================================================================== diff -u -r5c77968df3d50b52ec1285c1305f00833fd40a79 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 5c77968df3d50b52ec1285c1305f00833fd40a79) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -24,6 +24,7 @@ using Core.Common.Base.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Data @@ -162,6 +163,38 @@ } } + #region Derived input + + /// + /// Gets or sets the outside high water level. + /// [m] + /// + /// Thrown when the user attempts to set the + /// assessment level while is false + public RoundedDouble AssessmentLevel + { + get + { + if (!UseAssessmentLevelManualInput) + { + return HydraulicBoundaryLocation?.DesignWaterLevel ?? new RoundedDouble(2, double.NaN); + } + + return assessmentLevel; + } + set + { + if (!UseAssessmentLevelManualInput) + { + throw new InvalidOperationException("UseAssessmentLevelManualInput is false"); + } + + assessmentLevel = value.ToPrecision(assessmentLevel.NumberOfDecimalPlaces); + } + } + + #endregion + #region settings /// @@ -566,37 +599,5 @@ } #endregion - - #region Derived input - - /// - /// Gets or sets the outside high water level. - /// [m] - /// - /// Thrown when the user attempts to set the - /// assessment level while is false - public RoundedDouble AssessmentLevel - { - get - { - if (!UseAssessmentLevelManualInput) - { - return HydraulicBoundaryLocation?.DesignWaterLevel ?? new RoundedDouble(2, double.NaN); - } - - return assessmentLevel; - } - set - { - if (!UseAssessmentLevelManualInput) - { - throw new InvalidOperationException("UseAssessmentLevelManualInput is false"); - } - - assessmentLevel = value.ToPrecision(assessmentLevel.NumberOfDecimalPlaces); - } - } - - #endregion } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsTangentLineDetermination.cs =================================================================== diff -u -ra2fcfdc2e2c0c42a15983c86fc95a3cf38a3751c -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsTangentLineDetermination.cs (.../MacroStabilityInwardsTangentLineDetermination.cs) (revision a2fcfdc2e2c0c42a15983c86fc95a3cf38a3751c) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsTangentLineDetermination.cs (.../MacroStabilityInwardsTangentLineDetermination.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -31,6 +31,7 @@ { [ResourcesDisplayName(typeof(Resources), nameof(Resources.Specified_DisplayName))] Specified = 1, + [ResourcesDisplayName(typeof(Resources), nameof(Resources.LayerSeparated_DisplayName))] LayerSeparated = 2 } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj =================================================================== diff -u -r9ca04c726ce0c9ce7c4bcc65d3fd2ba62ac918b1 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 9ca04c726ce0c9ce7c4bcc65d3fd2ba62ac918b1) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj (.../Ringtoets.MacroStabilityInwards.Data.csproj) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -61,14 +61,14 @@ - - - - - - - - + + + + + + + + Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilLayerUnderSurfaceLine.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilLayerUnderSurfaceLine.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilLayerUnderSurfaceLine.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilLayerUnderSurfaceLine.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,85 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using Core.Common.Base.Geometry; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// A 2D soil layer that has been adapted by using a surface line. + /// + public class SoilLayerUnderSurfaceLine + { + /// + /// Creates a new instance of . + /// + /// The outer ring of the geometry of the soil layer. + /// The properties of the soil layer. + /// Thrown when any parameter is null. + public SoilLayerUnderSurfaceLine(Point2D[] outerRing, SoilLayerProperties properties) + : this(outerRing, Enumerable.Empty(), properties) {} + + /// + /// Creates a new instance of . + /// + /// The outer ring of the geometry of the soil layer. + /// The holes of the geometry of the soil layer. + /// The properties of the soil layer. + /// Thrown when any parameter is null. + public SoilLayerUnderSurfaceLine(Point2D[] outerRing, IEnumerable holes, SoilLayerProperties properties) + { + if (outerRing == null) + { + throw new ArgumentNullException(nameof(outerRing)); + } + if (holes == null) + { + throw new ArgumentNullException(nameof(holes)); + } + if (properties == null) + { + throw new ArgumentNullException(nameof(properties)); + } + OuterRing = outerRing; + Holes = holes; + Properties = properties; + } + + /// + /// Gets the outer ring of the geometry. + /// + public Point2D[] OuterRing { get; } + + /// + /// Gets the holes of the geometry. + /// + public IEnumerable Holes { get; } + + /// + /// Gets the properties of the soil layer. + /// + public SoilLayerProperties Properties { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilProfileUnderSurfaceLine.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilProfileUnderSurfaceLine.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilProfileUnderSurfaceLine.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,52 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// A soil profile for which its soil layers have been adapted using a surface line. + /// + public class SoilProfileUnderSurfaceLine + { + /// + /// Creates a new instance of . + /// + /// The layers in the profile. + /// Thrown when + /// is null. + public SoilProfileUnderSurfaceLine(IEnumerable layersUnderSurfaceLine) + { + if (layersUnderSurfaceLine == null) + { + throw new ArgumentNullException(nameof(layersUnderSurfaceLine)); + } + LayersUnderSurfaceLine = layersUnderSurfaceLine; + } + + /// + /// Gets the layers in the profile. + /// + public IEnumerable LayersUnderSurfaceLine { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilProfileUnderSurfaceLineFactory.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilProfileUnderSurfaceLineFactory.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/SoilProfileUnderSurfaceLineFactory.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,147 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using Core.Common.Base.Geometry; +using Core.Common.Geometry; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// Class for constructing soil profiles for which the geometry of the layers lay under a surface line. + /// + public static class SoilProfileUnderSurfaceLineFactory + { + /// + /// Creates a new . + /// + /// The soil profile containing layers under the . + /// The surface line for which determines the top of the . + /// A new containing geometries from the + /// under the . + /// Thrown when any parameter is null. + public static SoilProfileUnderSurfaceLine Create(MacroStabilityInwardsSoilProfile1D soilProfile, MacroStabilityInwardsSurfaceLine surfaceLine) + { + if (soilProfile == null) + { + throw new ArgumentNullException(nameof(soilProfile)); + } + if (surfaceLine == null) + { + throw new ArgumentNullException(nameof(surfaceLine)); + } + Point2D[] localizedSurfaceLine = surfaceLine.LocalGeometry.ToArray(); + + double geometryBottom = Math.Min(soilProfile.Bottom, localizedSurfaceLine.Min(p => p.Y)) - 1; + IEnumerable surfaceLineGeometry = AdvancedMath2D.CompleteLineToPolygon(localizedSurfaceLine, geometryBottom); + IEnumerable layerGeometries = soilProfile.Layers.Select( + layer => As2DGeometry( + layer, + soilProfile, + localizedSurfaceLine.First().X, + localizedSurfaceLine.Last().X)); + + return GeometriesToIntersections(layerGeometries, surfaceLineGeometry); + } + + /// + /// Creates a new . + /// + /// The soil profile containing layers. + /// A new containing geometries from the + /// . + /// Thrown when is null. + public static SoilProfileUnderSurfaceLine Create(MacroStabilityInwardsSoilProfile2D soilProfile) + { + if (soilProfile == null) + { + throw new ArgumentNullException(nameof(soilProfile)); + } + + IEnumerable layersUnderSurfaceLine = soilProfile.Layers.Select( + layer => new SoilLayerUnderSurfaceLine( + RingToPoints(layer.OuterRing), + layer.Holes.Select(RingToPoints), + layer.Properties)); + + return new SoilProfileUnderSurfaceLine(layersUnderSurfaceLine); + } + + private static Point2D[] RingToPoints(Ring ring) + { + return ring.Points.ToArray(); + } + + private static SoilProfileUnderSurfaceLine GeometriesToIntersections(IEnumerable layerGeometries, IEnumerable surfaceLineGeometry) + { + var collection = new Collection(); + + IEnumerable surfaceLineGeometryArray = surfaceLineGeometry.ToArray(); + + foreach (TempSoilLayerGeometry layer in layerGeometries) + { + foreach (Point2D[] soilLayerArea in GetSoilLayerWithSurfaceLineIntersection(surfaceLineGeometryArray, layer.OuterLoop)) + { + collection.Add(new SoilLayerUnderSurfaceLine(soilLayerArea, layer.Properties)); + } + } + + return new SoilProfileUnderSurfaceLine(collection); + } + + private static TempSoilLayerGeometry As2DGeometry(MacroStabilityInwardsSoilLayer1D layer, MacroStabilityInwardsSoilProfile1D soilProfile, double minX, double maxX) + { + double top = layer.Top; + double bottom = top - soilProfile.GetLayerThickness(layer); + + return new TempSoilLayerGeometry(new[] + { + new Point2D(minX, top), + new Point2D(maxX, top), + new Point2D(maxX, bottom), + new Point2D(minX, bottom) + }, layer.Properties); + } + + private static IEnumerable GetSoilLayerWithSurfaceLineIntersection(IEnumerable surfaceLineGeometry, IEnumerable soilLayerGeometry) + { + return AdvancedMath2D.PolygonIntersectionWithPolygon(surfaceLineGeometry, soilLayerGeometry).Where(arr => arr.Length > 2); + } + + private class TempSoilLayerGeometry + { + public TempSoilLayerGeometry(Point2D[] outerLoop, SoilLayerProperties properties) + { + OuterLoop = outerLoop; + Properties = properties; + InnerLoops = Enumerable.Empty(); + } + + public Point2D[] OuterLoop { get; } + public SoilLayerProperties Properties { get; } + public IEnumerable InnerLoops { get; } + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModel.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModel.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModel.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,147 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using Core.Common.Base; +using Core.Common.Base.Geometry; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// This class represents a stochastic soil model which consists out of a collection of . + /// A stochastic soil model contains a segment for which the model applies. + /// + public class StochasticSoilModel : Observable + { + /// + /// Creates a new instance of . + /// + /// Name of the segment soil model. + /// Thrown when is + /// null. + public StochasticSoilModel(string name) + { + if (name == null) + { + throw new ArgumentNullException(nameof(name)); + } + Name = name; + Geometry = new List(); + StochasticSoilProfiles = new List(); + } + + /// + /// Gets the name of the segment soil model. + /// + public string Name { get; private set; } + + /// + /// Gets the list of geometry points. + /// + public List Geometry { get; } + + /// + /// Gets the list of . + /// + public List StochasticSoilProfiles { get; } + + /// + /// Updates the with the properties + /// from . + /// + /// The to + /// obtain the property values from. + /// Thrown when + /// is null. + /// Thrown when + /// contains multiple profiles with the same name, and also contains a + /// profile with the same name. + /// + public StochasticSoilModelProfileDifference Update(StochasticSoilModel fromModel) + { + if (fromModel == null) + { + throw new ArgumentNullException(nameof(fromModel)); + } + + Name = fromModel.Name; + Geometry.Clear(); + foreach (Point2D point in fromModel.Geometry) + { + Geometry.Add(point); + } + + var newSoilProfiles = new List(); + var updatedProfiles = new List(); + var addedProfiles = new List(); + var removedProfiles = new List(); + + foreach (StochasticSoilProfile fromProfile in fromModel.StochasticSoilProfiles) + { + StochasticSoilProfile sameProfile = StochasticSoilProfiles.SingleOrDefault( + sp => IsSame(sp, fromProfile) + ); + if (sameProfile != null) + { + if (sameProfile.Update(fromProfile)) + { + updatedProfiles.Add(sameProfile); + } + } + else + { + StochasticSoilProfiles.Add(fromProfile); + addedProfiles.Add(fromProfile); + } + newSoilProfiles.Add(fromProfile.SoilProfile); + } + + foreach (StochasticSoilProfile profileToRemove in StochasticSoilProfiles.Where( + sp => !newSoilProfiles.Any(newSp => IsSame(newSp, sp.SoilProfile))).ToArray()) + { + StochasticSoilProfiles.Remove(profileToRemove); + removedProfiles.Add(profileToRemove); + } + + return new StochasticSoilModelProfileDifference(addedProfiles, updatedProfiles, removedProfiles); + } + + public override string ToString() + { + return Name; + } + + private static bool IsSame(ISoilProfile soilProfile, ISoilProfile otherSoilProfile) + { + bool equalNames = soilProfile.Name.Equals(otherSoilProfile.Name); + bool equalTypes = soilProfile.GetType() == otherSoilProfile.GetType(); + return equalNames && equalTypes; + } + + private static bool IsSame(StochasticSoilProfile stochasticSoilProfile, StochasticSoilProfile otherStochasticSoilProfile) + { + return IsSame(stochasticSoilProfile.SoilProfile, otherStochasticSoilProfile.SoilProfile); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelCollection.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelCollection.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelCollection.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,38 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Core.Common.Base; +using Ringtoets.MacroStabilityInwards.Data.Properties; +using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// A collection of . The names of the elements are + /// unique within the collection. + /// + public class StochasticSoilModelCollection : ObservableUniqueItemCollectionWithSourcePath + { + public StochasticSoilModelCollection() : base(model => model.Name, + RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor, + Resources.UniqueFeature_Name_FeatureDescription) {} + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelExtensions.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelExtensions.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelExtensions.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,71 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using Core.Common.Base.Geometry; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// Extension methods dealing with instances. + /// + public static class StochasticSoilModelExtensions + { + /// + /// Indicates whether a stochastic soil model intersects with a surface line. + /// + /// The stochastic soil model used to match a surface line. + /// The surface line used to match a stochastic soil model. + /// true when the intersects with the ; + /// false otherwise. + /// Thrown when any input parameter is null. + public static bool IntersectsWithSurfaceLineGeometry(this StochasticSoilModel stochasticSoilModel, + MacroStabilityInwardsSurfaceLine surfaceLine) + { + if (stochasticSoilModel == null) + { + throw new ArgumentNullException(nameof(stochasticSoilModel)); + } + if (surfaceLine == null) + { + throw new ArgumentNullException(nameof(surfaceLine)); + } + + Segment2D[] surfaceLineSegments = Math2D.ConvertLinePointsToLineSegments(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))).ToArray(); + return DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(stochasticSoilModel, surfaceLineSegments); + } + + private static bool DoesSoilModelGeometryIntersectWithSurfaceLineGeometry(StochasticSoilModel stochasticSoilModel, Segment2D[] surfaceLineSegments) + { + IEnumerable soilProfileGeometrySegments = Math2D.ConvertLinePointsToLineSegments(stochasticSoilModel.Geometry); + return soilProfileGeometrySegments.Any(s => DoesSegmentIntersectWithSegmentArray(s, surfaceLineSegments)); + } + + private static bool DoesSegmentIntersectWithSegmentArray(Segment2D segment, Segment2D[] segmentArray) + { + // Consider intersections and overlaps similarly + return segmentArray.Any(sls => Math2D.GetIntersectionBetweenSegments(segment, sls).IntersectionType != Intersection2DType.DoesNotIntersect); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelProfileDifference.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelProfileDifference.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilModelProfileDifference.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,63 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// Container for the differences of the collection of contained + /// by a . + /// + public class StochasticSoilModelProfileDifference + { + /// + /// Creates a new instance of . + /// + /// Profiles that were added to the model. + /// Profiles that were updated. + /// Profiles that were removed from the model. + public StochasticSoilModelProfileDifference( + IEnumerable addedProfiles, + IEnumerable updatedProfiles, + IEnumerable removedProfiles) + { + AddedProfiles = addedProfiles; + UpdatedProfiles = updatedProfiles; + RemovedProfiles = removedProfiles; + } + + /// + /// Gets the profiles that were updated. + /// + public IEnumerable UpdatedProfiles { get; } + + /// + /// Gets the profiles that were removed from the model. + /// + public IEnumerable RemovedProfiles { get; } + + /// + /// Gets the profiles that were added to the model. + /// + public IEnumerable AddedProfiles { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilProfile.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilProfile.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/StochasticSoilProfile.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,159 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Globalization; +using Core.Common.Base; +using Core.Common.Base.Data; +using Ringtoets.MacroStabilityInwards.Data.Properties; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.SoilProfile +{ + /// + /// This class couples a SoilProfile to a probability of occurrence. + /// + public class StochasticSoilProfile : Observable + { + private static readonly Range probabilityValidityRange = new Range(0, 1); + private double probability; + + /// + /// Creates a new instance of . + /// + /// Probability of the stochastic soil profile. + /// Type of the stochastic soil profile. + /// Database identifier of the stochastic soil profile. + public StochasticSoilProfile(double probability, SoilProfileType soilProfileType, long soilProfileId) + { + Probability = probability; + SoilProfileType = soilProfileType; + SoilProfileId = soilProfileId; + } + + /// + /// Gets the type of the stochastic soil profile. + /// + public SoilProfileType SoilProfileType { get; private set; } + + /// + /// Gets the database identifier of the stochastic soil profile. + /// + public long SoilProfileId { get; } + + /// + /// Gets the . + /// + public ISoilProfile SoilProfile { get; set; } + + /// + /// Gets the probability of the stochastic soil profile. + /// + /// Thrown when the is outside the range + /// [0, 1]. + public double Probability + { + get + { + return probability; + } + private set + { + if (!probabilityValidityRange.InRange(value)) + { + throw new ArgumentOutOfRangeException( + nameof(value), + string.Format( + Resources.StochasticSoilProfile_Probability_Should_be_in_range_0_, + probabilityValidityRange.ToString(FormattableConstants.ShowAtLeastOneDecimal, CultureInfo.CurrentCulture))); + } + probability = value; + } + } + + /// + /// Updates the probability of the + /// by adding . + /// + /// The amount to increase the + /// with. + public void AddProbability(double probabilityToAdd) + { + Probability += probabilityToAdd; + } + + /// + /// Updates the with the properties + /// from . + /// + /// The to + /// obtain the property values from. + /// Thrown when + /// is null. + /// true if the profile has been updated; false otherwise. + public bool Update(StochasticSoilProfile fromProfile) + { + if (fromProfile == null) + { + throw new ArgumentNullException(nameof(fromProfile)); + } + if (!Equals(fromProfile)) + { + SoilProfile = fromProfile.SoilProfile; + SoilProfileType = fromProfile.SoilProfileType; + Probability = fromProfile.Probability; + return true; + } + return false; + } + + public override string ToString() + { + return SoilProfile?.ToString() ?? string.Empty; + } + + public override bool Equals(object obj) + { + if (ReferenceEquals(null, obj)) return false; + if (ReferenceEquals(this, obj)) return true; + if (obj.GetType() != GetType()) return false; + return Equals((StochasticSoilProfile) obj); + } + + public override int GetHashCode() + { + unchecked + { + int hashCode = Probability.GetHashCode(); + hashCode = (hashCode * 397) ^ (int) SoilProfileType; + hashCode = (hashCode * 397) ^ (SoilProfile?.GetHashCode() ?? 0); + return hashCode; + } + } + + private bool Equals(StochasticSoilProfile other) + { + return Probability.Equals(other.Probability) + && SoilProfileType == other.SoilProfileType + && Equals(SoilProfile, other.SoilProfile); + } + } +} \ No newline at end of file Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfileUnderSurfaceLine.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfileUnderSurfaceLineFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModel.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModelCollection.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModelExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModelProfileDifference.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilProfile.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs =================================================================== diff -u -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs (.../MacroStabilityInwardsMapDataFactory.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFactory.cs (.../MacroStabilityInwardsMapDataFactory.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -22,7 +22,7 @@ using System.Drawing; using Core.Components.Gis.Data; using Core.Components.Gis.Style; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs (.../MacroStabilityInwardsMapDataFeaturesFactory.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs (.../MacroStabilityInwardsMapDataFeaturesFactory.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using Ringtoets.Common.Forms.Factories; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.Helpers; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationGroupContext.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationGroupContext.cs (.../MacroStabilityInwardsCalculationGroupContext.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationGroupContext.cs (.../MacroStabilityInwardsCalculationGroupContext.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -25,6 +25,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.PresentationObjects Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationScenarioContext.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationScenarioContext.cs (.../MacroStabilityInwardsCalculationScenarioContext.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsCalculationScenarioContext.cs (.../MacroStabilityInwardsCalculationScenarioContext.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -25,6 +25,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.PresentationObjects Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs (.../MacroStabilityInwardsContext.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsContext.cs (.../MacroStabilityInwardsContext.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.PresentationObjects Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsInputContext.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsInputContext.cs (.../MacroStabilityInwardsInputContext.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsInputContext.cs (.../MacroStabilityInwardsInputContext.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -23,6 +23,7 @@ using System.Collections.Generic; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.PresentationObjects Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/StochasticSoilModelCollectionContext.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/StochasticSoilModelCollectionContext.cs (.../StochasticSoilModelCollectionContext.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/StochasticSoilModelCollectionContext.cs (.../StochasticSoilModelCollectionContext.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -23,6 +23,7 @@ using Core.Common.Controls.PresentationObjects; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; namespace Ringtoets.MacroStabilityInwards.Forms.PresentationObjects { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs =================================================================== diff -u -rfeb863dccfb07cb86ef8c26e3610129ac299553b -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs (.../MacroStabilityInwardsInputContextProperties.cs) (revision feb863dccfb07cb86ef8c26e3610129ac299553b) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsInputContextProperties.cs (.../MacroStabilityInwardsInputContextProperties.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -35,6 +35,7 @@ using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Forms.UITypeEditors; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Forms.UITypeEditors; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelCollectionProperties.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelCollectionProperties.cs (.../StochasticSoilModelCollectionProperties.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelCollectionProperties.cs (.../StochasticSoilModelCollectionProperties.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -22,7 +22,7 @@ using System; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelProperties.cs =================================================================== diff -u -r6a241363ac2d257e8012cb6336d66a8e9e350b8d -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilModelProperties.cs (.../StochasticSoilModelProperties.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,7 +26,7 @@ using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Properties; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs =================================================================== diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision d47809e3a8fadff2be5b10056b79b16dc27eeca2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/StochasticSoilProfileProperties.cs (.../StochasticSoilProfileProperties.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,7 +27,7 @@ using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -74,7 +74,7 @@ { get { - return ((MacroStabilityInwardsSoilProfile1D)data.SoilProfile)?.Layers.Select(l => l.Top).ToArray() ?? new double[0]; + return ((MacroStabilityInwardsSoilProfile1D) data.SoilProfile)?.Layers.Select(l => l.Top).ToArray() ?? new double[0]; } } @@ -86,7 +86,7 @@ { get { - return ((MacroStabilityInwardsSoilProfile1D)data.SoilProfile)?.Bottom ?? double.NaN; + return ((MacroStabilityInwardsSoilProfile1D) data.SoilProfile)?.Bottom ?? double.NaN; } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditor.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.ComponentModel; using Core.Common.Gui.UITypeEditors; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; namespace Ringtoets.MacroStabilityInwards.Forms.UITypeEditors Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs =================================================================== diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs) (revision d47809e3a8fadff2be5b10056b79b16dc27eeca2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.ComponentModel; using Core.Common.Gui.UITypeEditors; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationRow.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationRow.cs (.../MacroStabilityInwardsCalculationRow.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationRow.cs (.../MacroStabilityInwardsCalculationRow.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; namespace Ringtoets.MacroStabilityInwards.Forms.Views { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs =================================================================== diff -u -r721c0d4f72803e74398f903d86fa9c1cb0d9ced8 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision 721c0d4f72803e74398f903d86fa9c1cb0d9ced8) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsCalculationsView.cs (.../MacroStabilityInwardsCalculationsView.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -35,6 +35,7 @@ using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -31,6 +31,7 @@ using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Forms.Factories; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Factories; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs (.../MacroStabilityInwardsInputView.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -181,7 +181,7 @@ private void UpdateTableData() { - soilLayerTable.SetData(((MacroStabilityInwardsSoilProfile1D)data?.InputParameters.StochasticSoilProfile?.SoilProfile)?.Layers); + soilLayerTable.SetData(((MacroStabilityInwardsSoilProfile1D) data?.InputParameters.StochasticSoilProfile?.SoilProfile)?.Layers); } private void SetChartData() @@ -210,7 +210,7 @@ private void SetSoilProfileChartData() { - MacroStabilityInwardsSoilProfile1D soilProfile = (MacroStabilityInwardsSoilProfile1D)data.InputParameters.StochasticSoilProfile?.SoilProfile; + var soilProfile = (MacroStabilityInwardsSoilProfile1D) data.InputParameters.StochasticSoilProfile?.SoilProfile; // If necessary, regenerate all soil layer chart data if (!ReferenceEquals(currentSoilProfile, soilProfile)) @@ -242,7 +242,7 @@ private IList GetSoilLayers() { - return ((MacroStabilityInwardsSoilProfile1D)data?.InputParameters.StochasticSoilProfile?.SoilProfile)?.Layers.ToList() ?? new List(); + return ((MacroStabilityInwardsSoilProfile1D) data?.InputParameters.StochasticSoilProfile?.SoilProfile)?.Layers.ToList() ?? new List(); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilDatabaseQueryBuilder.cs =================================================================== diff -u -r261d8e56f76b7bb4f5c5be7082bc3dfcb281657c -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 261d8e56f76b7bb4f5c5be7082bc3dfcb281657c) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.SoilProfile.Schema; namespace Ringtoets.MacroStabilityInwards.IO.Builders @@ -60,10 +61,10 @@ } /// - /// Returns the query to get the amount of + /// Returns the query to get the amount of /// that can be read from the database. /// - /// The query to get the amount of + /// The query to get the amount of /// from the database. public static string GetStochasticSoilModelOfMechanismCountQuery() { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -ra1e976b5692d931d9bf7bc79ad667a2587125978 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision a1e976b5692d931d9bf7bc79ad667a2587125978) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using Ringtoets.Common.IO.Configurations.Helpers; using Ringtoets.Common.IO.Configurations.Import; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Properties; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Exceptions/StochasticSoilProfileReadException.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Exceptions/StochasticSoilProfileReadException.cs (.../StochasticSoilProfileReadException.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Exceptions/StochasticSoilProfileReadException.cs (.../StochasticSoilProfileReadException.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -21,11 +21,12 @@ using System; using System.Runtime.Serialization; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; namespace Ringtoets.MacroStabilityInwards.IO.Exceptions { /// - /// The exception that is thrown when failed to read a from the DSoil-database. + /// The exception that is thrown when failed to read a from the DSoil-database. /// [Serializable] public class StochasticSoilProfileReadException : Exception Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/IStochasticSoilModelUpdateModelStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/IStochasticSoilModelUpdateModelStrategy.cs (.../IStochasticSoilModelUpdateModelStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/IStochasticSoilModelUpdateModelStrategy.cs (.../IStochasticSoilModelUpdateModelStrategy.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -23,7 +23,7 @@ using System.Collections.Generic; using Core.Common.Base; using Ringtoets.Common.Data.Exceptions; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; namespace Ringtoets.MacroStabilityInwards.IO.Importers { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/StochasticSoilModelImporter.cs =================================================================== diff -u -r513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 513400f1ec7b01dd0e4d3ce2681af3c1e8bf2e0e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Importers/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,7 +28,7 @@ using Core.Common.IO.Readers; using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.IO.FileImporters.MessageProviders; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Exceptions; using Ringtoets.MacroStabilityInwards.IO.Properties; using Ringtoets.MacroStabilityInwards.IO.SoilProfile; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/MacroStabilityInwardsSoilProfileReader.cs =================================================================== diff -u -rcbf7b4ba9b60558ba8827706bb2ebc5f53cfe063 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/MacroStabilityInwardsSoilProfileReader.cs (.../MacroStabilityInwardsSoilProfileReader.cs) (revision cbf7b4ba9b60558ba8827706bb2ebc5f53cfe063) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/MacroStabilityInwardsSoilProfileReader.cs (.../MacroStabilityInwardsSoilProfileReader.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -98,12 +98,6 @@ } } - protected override void Dispose(bool disposing) - { - dataReader?.Dispose(); - base.Dispose(disposing); - } - /// /// Moves the reader to the next record in the database. /// @@ -142,6 +136,12 @@ return (T) dataReader[columnName]; } + protected override void Dispose(bool disposing) + { + dataReader?.Dispose(); + base.Dispose(disposing); + } + private void VerifyVersion(string databaseFilePath) { using (var versionReader = new SoilDatabaseVersionReader(databaseFilePath)) Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs =================================================================== diff -u -r190069e93048bfb7abe5a190ada915e4b4e782b0 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 190069e93048bfb7abe5a190ada915e4b4e782b0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,7 +26,7 @@ using Core.Common.Base.IO; using Core.Common.IO.Readers; using Core.Common.Utils.Builders; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Builders; using Ringtoets.MacroStabilityInwards.IO.Exceptions; using Ringtoets.MacroStabilityInwards.IO.Properties; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilProfileReader.cs =================================================================== diff -u -r190069e93048bfb7abe5a190ada915e4b4e782b0 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilProfileReader.cs (.../StochasticSoilProfileReader.cs) (revision 190069e93048bfb7abe5a190ada915e4b4e782b0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilProfileReader.cs (.../StochasticSoilProfileReader.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -25,7 +25,7 @@ using Core.Common.Base.IO; using Core.Common.IO.Readers; using Core.Common.Utils.Builders; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Builders; using Ringtoets.MacroStabilityInwards.IO.Exceptions; using Ringtoets.MacroStabilityInwards.IO.Properties; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategy.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategy.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategy.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategy.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategy.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using Ringtoets.Common.IO.SurfaceLines; using Ringtoets.Common.Service; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms; using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.MacroStabilityInwards.Service; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs (.../StochasticSoilModelReplaceDataStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/StochasticSoilModelReplaceDataStrategy.cs (.../StochasticSoilModelReplaceDataStrategy.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -24,6 +24,7 @@ using Core.Common.Base; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.Service; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs =================================================================== diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs (.../StochasticSoilModelUpdateDataStrategy.cs) (revision d47809e3a8fadff2be5b10056b79b16dc27eeca2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/StochasticSoilModelUpdateDataStrategy.cs (.../StochasticSoilModelUpdateDataStrategy.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,6 +26,7 @@ using Core.Common.Utils; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.MacroStabilityInwards.Service; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -42,6 +42,7 @@ using Ringtoets.Common.IO.FileImporters.MessageProviders; using Ringtoets.Common.IO.SurfaceLines; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs (.../MacroStabilityInwardsDataSynchronizationService.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsDataSynchronizationService.cs (.../MacroStabilityInwardsDataSynchronizationService.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Service; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Service Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsInputService.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsInputService.cs (.../MacroStabilityInwardsInputService.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsInputService.cs (.../MacroStabilityInwardsInputService.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -22,6 +22,7 @@ using System.Collections.Generic; using System.Linq; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; namespace Ringtoets.MacroStabilityInwards.Service { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs =================================================================== diff -u -r5c77968df3d50b52ec1285c1305f00833fd40a79 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 5c77968df3d50b52ec1285c1305f00833fd40a79) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -162,32 +162,32 @@ double penetrationLength = random.Next(); double tangentLineZTop = random.Next(); double tangentLineZBottom = random.Next(); - + // Call var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { SlipPlaneMinimumDepth = (RoundedDouble) slipPlaneMinimumDepth, - SlipPlaneMinimumLength = (RoundedDouble)slipPlaneMinimumLength, - MaximumSliceWidth = (RoundedDouble)maximumSliceWidth, - WaterLevelRiverAverage = (RoundedDouble)waterLevelRiverAverage, - WaterLevelPolder = (RoundedDouble)waterLevelPolder, - XCoordinateDrainageConstruction = (RoundedDouble)xCoordinateDrainageConstruction, - ZCoordinateDrainageConstruction = (RoundedDouble)zCoordinateDrainageConstruction, - MinimumLevelPhreaticLineAtDikeTopRiver = (RoundedDouble)minimumLevelPhreaticLineAtDikeTopRiver, - MinimumLevelPhreaticLineAtDikeTopPolder = (RoundedDouble)minimumLevelPhreaticLineAtDikeTopPolder, - PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble)phreaticLineOffsetBelowDikeTopAtRiver, - PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble)phreaticLineOffsetBelowDikeTopAtPolder, - PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble)phreaticLineOffsetBelowShoulderBaseInside, - PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble)phreaticLineOffsetBelowDikeToeAtPolder, - LeakageLengthOutwardsPhreaticLine3 = (RoundedDouble)leakageLengthOutwardsPhreaticLine3, - LeakageLengthInwardsPhreaticLine3 = (RoundedDouble)leakageLengthInwardsPhreaticLine3, - LeakageLengthOutwardsPhreaticLine4 = (RoundedDouble)leakageLengthOutwardsPhreaticLine4, - LeakageLengthInwardsPhreaticLine4 = (RoundedDouble)leakageLengthInwardsPhreaticLine4, - PiezometricHeadPhreaticLine2Outwards = (RoundedDouble)piezometricHeadPhreaticLine2Outwards, - PiezometricHeadPhreaticLine2Inwards = (RoundedDouble)piezometricHeadPhreaticLine2Inwards, - PenetrationLength = (RoundedDouble)penetrationLength, - TangentLineZTop = (RoundedDouble)tangentLineZTop, - TangentLineZBottom = (RoundedDouble)tangentLineZBottom, + SlipPlaneMinimumLength = (RoundedDouble) slipPlaneMinimumLength, + MaximumSliceWidth = (RoundedDouble) maximumSliceWidth, + WaterLevelRiverAverage = (RoundedDouble) waterLevelRiverAverage, + WaterLevelPolder = (RoundedDouble) waterLevelPolder, + XCoordinateDrainageConstruction = (RoundedDouble) xCoordinateDrainageConstruction, + ZCoordinateDrainageConstruction = (RoundedDouble) zCoordinateDrainageConstruction, + MinimumLevelPhreaticLineAtDikeTopRiver = (RoundedDouble) minimumLevelPhreaticLineAtDikeTopRiver, + MinimumLevelPhreaticLineAtDikeTopPolder = (RoundedDouble) minimumLevelPhreaticLineAtDikeTopPolder, + PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) phreaticLineOffsetBelowDikeTopAtRiver, + PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) phreaticLineOffsetBelowDikeTopAtPolder, + PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) phreaticLineOffsetBelowShoulderBaseInside, + PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) phreaticLineOffsetBelowDikeToeAtPolder, + LeakageLengthOutwardsPhreaticLine3 = (RoundedDouble) leakageLengthOutwardsPhreaticLine3, + LeakageLengthInwardsPhreaticLine3 = (RoundedDouble) leakageLengthInwardsPhreaticLine3, + LeakageLengthOutwardsPhreaticLine4 = (RoundedDouble) leakageLengthOutwardsPhreaticLine4, + LeakageLengthInwardsPhreaticLine4 = (RoundedDouble) leakageLengthInwardsPhreaticLine4, + PiezometricHeadPhreaticLine2Outwards = (RoundedDouble) piezometricHeadPhreaticLine2Outwards, + PiezometricHeadPhreaticLine2Inwards = (RoundedDouble) piezometricHeadPhreaticLine2Inwards, + PenetrationLength = (RoundedDouble) penetrationLength, + TangentLineZTop = (RoundedDouble) tangentLineZTop, + TangentLineZBottom = (RoundedDouble) tangentLineZBottom }; // Assert Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj =================================================================== diff -u -r9ca04c726ce0c9ce7c4bcc65d3fd2ba62ac918b1 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision 9ca04c726ce0c9ce7c4bcc65d3fd2ba62ac918b1) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.Test.csproj) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -65,8 +65,8 @@ - - + + @@ -76,11 +76,11 @@ - - - - - + + + + + Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilLayerUnderSurfaceLineTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilLayerUnderSurfaceLineTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilLayerUnderSurfaceLineTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilLayerUnderSurfaceLineTest.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,123 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using Core.Common.Base.Geometry; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile +{ + [TestFixture] + public class SoilLayerUnderSurfaceLineTest + { + [Test] + public void Constructor_WithoutOuterRingWithHolesAndProperties_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => new SoilLayerUnderSurfaceLine(null, Enumerable.Empty(), new SoilLayerProperties()); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("outerRing", exception.ParamName); + } + + [Test] + public void Constructor_WithoutHolesWithOuterRingAndProperties_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => new SoilLayerUnderSurfaceLine(new Point2D[0], null, new SoilLayerProperties()); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("holes", exception.ParamName); + } + + [Test] + public void Constructor_WithoutPropertiesWithOuterRingAndHoles_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => new SoilLayerUnderSurfaceLine(new Point2D[0], Enumerable.Empty(), null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("properties", exception.ParamName); + } + + [Test] + public void Constructor_WithoutOuterRingWithProperties_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => new SoilLayerUnderSurfaceLine(null, new SoilLayerProperties()); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("outerRing", exception.ParamName); + } + + [Test] + public void Constructor_WithoutPropertiesWithOuterRing_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => new SoilLayerUnderSurfaceLine(new Point2D[0], null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("properties", exception.ParamName); + } + + [Test] + public void Constructor_WithOuterRingAndHolesAndProperties_NewInstanceWithPropertiesSet() + { + // Call + var outerRing = new Point2D[0]; + IEnumerable holes = Enumerable.Empty(); + var properties = new SoilLayerProperties(); + + // Setup + var layer = new SoilLayerUnderSurfaceLine(outerRing, holes, properties); + + // Assert + Assert.AreSame(outerRing, layer.OuterRing); + Assert.AreSame(holes, layer.Holes); + Assert.AreSame(properties, layer.Properties); + } + + [Test] + public void Constructor_WithOuterRingAndProperties_NewInstanceWithPropertiesSet() + { + // Call + var outerRing = new Point2D[0]; + var properties = new SoilLayerProperties(); + + // Setup + var layer = new SoilLayerUnderSurfaceLine(outerRing, properties); + + // Assert + Assert.AreSame(outerRing, layer.OuterRing); + Assert.IsEmpty(layer.Holes); + Assert.AreSame(properties, layer.Properties); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilProfileUnderSurfaceLineFactoryTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilProfileUnderSurfaceLineFactoryTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilProfileUnderSurfaceLineFactoryTest.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,377 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using Core.Common.Base.Geometry; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile +{ + [TestFixture] + public class SoilProfileUnderSurfaceLineFactoryTest + { + [Test] + public void Create_SoilProfile1DNull_ThrowArgumentNullException() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + + // Call + TestDelegate test = () => SoilProfileUnderSurfaceLineFactory.Create(null, surfaceLine); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("soilProfile", exception.ParamName); + } + + [Test] + public void Create_SurfaceLineNull_ThrowArgumentNullException() + { + // Setup + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", 2.0, new[] + { + new MacroStabilityInwardsSoilLayer1D(2) + }, SoilProfileType.SoilProfile1D, 0); + + // Call + TestDelegate test = () => SoilProfileUnderSurfaceLineFactory.Create(soilProfile, null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("surfaceLine", exception.ParamName); + } + + [Test] + public void Create_SoilProfile2DNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => SoilProfileUnderSurfaceLineFactory.Create(null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("soilProfile", exception.ParamName); + } + + [Test] + public void Create_SurfaceLineOnTopOrAboveSoilLayer_ReturnsSoilLayerPointsAsRectangle() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0, 0, 4), + new Point3D(0, 0, 3.2), + new Point3D(2, 0, 4) + }); + var soilLayer = new MacroStabilityInwardsSoilLayer1D(3.2); + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", 2.0, new[] + { + soilLayer + }, SoilProfileType.SoilProfile1D, 0); + + // Call + SoilProfileUnderSurfaceLine areas = SoilProfileUnderSurfaceLineFactory.Create(soilProfile, surfaceLine); + + // Assert + Assert.AreEqual(1, areas.LayersUnderSurfaceLine.Count()); + CollectionAssert.AreEqual(new[] + { + new Point2D(2, 3.2), + new Point2D(2, 2), + new Point2D(0, 2), + new Point2D(0, 3.2) + }, areas.LayersUnderSurfaceLine.ElementAt(0).OuterRing); + } + + [Test] + public void Create_SurfaceLineBelowSoilLayer_ReturnsEmptyAreasCollection() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0, 0, 2.0), + new Point3D(2, 0, 2.0) + }); + var soilLayer = new MacroStabilityInwardsSoilLayer1D(3.2); + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", 2.0, new[] + { + soilLayer + }, SoilProfileType.SoilProfile1D, 0); + + // Call + SoilProfileUnderSurfaceLine areas = SoilProfileUnderSurfaceLineFactory.Create(soilProfile, surfaceLine); + + // Assert + CollectionAssert.IsEmpty(areas.LayersUnderSurfaceLine); + } + + [Test] + public void Create_SurfaceLineThroughMiddleLayerButNotSplittingIt_ReturnsSoilLayerPointsAsRectangleFollowingSurfaceLine() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0, 0, 3.0), + new Point3D(1, 0, 2.0), + new Point3D(2, 0, 3.0) + }); + const double bottom = 1.5; + const double top = 2.5; + var soilLayer = new MacroStabilityInwardsSoilLayer1D(top); + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", bottom, new[] + { + soilLayer + }, SoilProfileType.SoilProfile1D, 0); + + // Call + SoilProfileUnderSurfaceLine areas = SoilProfileUnderSurfaceLineFactory.Create(soilProfile, surfaceLine); + + // Assert + Assert.AreEqual(1, areas.LayersUnderSurfaceLine.Count()); + CollectionAssert.AreEqual(new[] + { + new Point2D(0.5, top), + new Point2D(1, 2.0), + new Point2D(1.5, top), + new Point2D(2, top), + new Point2D(2, bottom), + new Point2D(0, bottom), + new Point2D(0, top) + }, areas.LayersUnderSurfaceLine.ElementAt(0).OuterRing); + } + + [Test] + public void Create_SurfaceLineThroughMiddleLayerButNotSplittingItIntersectionOnTopLevel_ReturnsSoilLayerPointsAsRectangleFollowingSurfaceLine() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0, 0, 3.0), + new Point3D(0.5, 0, 2.5), + new Point3D(1, 0, 2.0), + new Point3D(1.5, 0, 2.5), + new Point3D(2, 0, 3.0) + }); + const double bottom = 1.5; + const double top = 2.5; + var soilLayer = new MacroStabilityInwardsSoilLayer1D(top); + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", bottom, new[] + { + soilLayer + }, SoilProfileType.SoilProfile1D, 0); + + // Call + SoilProfileUnderSurfaceLine areas = SoilProfileUnderSurfaceLineFactory.Create(soilProfile, surfaceLine); + + // Assert + Assert.AreEqual(1, areas.LayersUnderSurfaceLine.Count()); + CollectionAssert.AreEqual(new[] + { + new Point2D(0.5, top), + new Point2D(1, 2.0), + new Point2D(1.5, top), + new Point2D(2, top), + new Point2D(2, bottom), + new Point2D(0, bottom), + new Point2D(0, top) + }, areas.LayersUnderSurfaceLine.ElementAt(0).OuterRing); + } + + [Test] + public void Create_SurfaceLineStartsBelowLayerTopButAboveBottom_ReturnsSoilLayerPointsAsRectangleFollowingSurfaceLine() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0, 0, 2.0), + new Point3D(1, 0, 2.0), + new Point3D(2, 0, 3.0) + }); + const double bottom = 1.5; + const double top = 2.5; + var soilLayer = new MacroStabilityInwardsSoilLayer1D(top); + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", bottom, new[] + { + soilLayer + }, SoilProfileType.SoilProfile1D, 0); + + // Call + SoilProfileUnderSurfaceLine areas = SoilProfileUnderSurfaceLineFactory.Create(soilProfile, surfaceLine); + + // Assert + Assert.AreEqual(1, areas.LayersUnderSurfaceLine.Count()); + CollectionAssert.AreEqual(new[] + { + new Point2D(0, 2.0), + new Point2D(1, 2.0), + new Point2D(1.5, top), + new Point2D(2, top), + new Point2D(2, bottom), + new Point2D(0, bottom) + }, areas.LayersUnderSurfaceLine.ElementAt(0).OuterRing); + } + + [Test] + public void Create_SurfaceLineEndsBelowLayerTopButAboveBottom_ReturnsSoilLayerPointsAsRectangleFollowingSurfaceLine() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0, 0, 3.0), + new Point3D(1, 0, 2.0), + new Point3D(2, 0, 2.0) + }); + const double bottom = 1.5; + const double top = 2.5; + var soilLayer = new MacroStabilityInwardsSoilLayer1D(top); + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", bottom, new[] + { + soilLayer + }, SoilProfileType.SoilProfile1D, 0); + + // Call + SoilProfileUnderSurfaceLine areas = SoilProfileUnderSurfaceLineFactory.Create(soilProfile, surfaceLine); + + // Assert + Assert.AreEqual(1, areas.LayersUnderSurfaceLine.Count()); + CollectionAssert.AreEqual(new[] + { + new Point2D(0.5, top), + new Point2D(1, 2.0), + new Point2D(2, 2.0), + new Point2D(2, bottom), + new Point2D(0, bottom), + new Point2D(0, top) + }, areas.LayersUnderSurfaceLine.ElementAt(0).OuterRing); + } + + [Test] + public void Create_SurfaceLineZigZagsThroughSoilLayer_ReturnsSoilLayerPointsSplitInMultipleAreas() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0, 0, 4.0), + new Point3D(4, 0, 0.0), + new Point3D(8, 0, 4.0) + }); + const int bottom = 1; + const int top = 3; + var soilLayer = new MacroStabilityInwardsSoilLayer1D(top); + var soilProfile = new MacroStabilityInwardsSoilProfile1D("name", bottom, new[] + { + soilLayer + }, SoilProfileType.SoilProfile1D, 0); + + // Call + SoilProfileUnderSurfaceLine areas = SoilProfileUnderSurfaceLineFactory.Create(soilProfile, surfaceLine); + + // Assert + Assert.AreEqual(2, areas.LayersUnderSurfaceLine.Count()); + CollectionAssert.AreEqual(new[] + { + new Point2D(1, top), + new Point2D(3, bottom), + new Point2D(0, bottom), + new Point2D(0, top) + }, areas.LayersUnderSurfaceLine.ElementAt(0).OuterRing); + CollectionAssert.AreEqual(new[] + { + new Point2D(5, bottom), + new Point2D(7, top), + new Point2D(8, top), + new Point2D(8, bottom) + }, areas.LayersUnderSurfaceLine.ElementAt(1).OuterRing); + } + + [Test] + public void Create_SoilProfile2DWithOuterRingAndHoles_ReturnsEqualGeometries() + { + // Setup + Ring outerRingA = CreateRing(21); + Ring outerRingB = CreateRing(12); + var holesA = new[] + { + CreateRing(4), + CreateRing(7) + }; + var holesB = new[] + { + CreateRing(4), + CreateRing(7), + CreateRing(2) + }; + IEnumerable layers = new[] + { + new MacroStabilityInwardsSoilLayer2D(outerRingA, holesA), + new MacroStabilityInwardsSoilLayer2D(outerRingB, holesB) + }; + var profile = new MacroStabilityInwardsSoilProfile2D("name", layers, SoilProfileType.SoilProfile2D, 0); + + // Call + SoilProfileUnderSurfaceLine profileUnderSurfaceLine = SoilProfileUnderSurfaceLineFactory.Create(profile); + + // Assert + Assert.AreEqual(2, profileUnderSurfaceLine.LayersUnderSurfaceLine.Count()); + CollectionAssert.AreEqual(new[] + { + outerRingA.Points, + outerRingB.Points + }, profileUnderSurfaceLine.LayersUnderSurfaceLine.Select(layer => layer.OuterRing)); + CollectionAssert.AreEqual(new[] + { + holesA.Select(h => h.Points), + holesB.Select(h => h.Points) + }, profileUnderSurfaceLine.LayersUnderSurfaceLine.Select(layer => layer.Holes)); + } + + private static Ring CreateRing(int seed) + { + var random = new Random(seed); + int x1 = random.Next(); + int y1 = random.Next(); + int x2 = x1; + int y2 = y1 + random.Next(); + int x3 = x2 + random.Next(); + int y3 = y2; + double x4 = x1 + (x3 - x1) * random.NextDouble(); + int y4 = y1; + + return new Ring(new[] + { + new Point2D(x1, y1), + new Point2D(x2, y2), + new Point2D(x3, y3), + new Point2D(x4, y4) + }); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilProfileUnderSurfaceLineTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilProfileUnderSurfaceLineTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/SoilProfileUnderSurfaceLineTest.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,57 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; + +namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile +{ + [TestFixture] + public class SoilProfileUnderSurfaceLineTest + { + [Test] + public void Constructor_WithoutLayersUnderSurfaceLine_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => new SoilProfileUnderSurfaceLine(null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("layersUnderSurfaceLine", exception.ParamName); + } + + [Test] + public void Constructor_WithLayersUnderSurfaceLine_NewInstanceWithPropertiesSet() + { + // Call + IEnumerable layers = Enumerable.Empty(); + + // Setup + var profile = new SoilProfileUnderSurfaceLine(layers); + + // Assert + Assert.AreSame(layers, profile.LayersUnderSurfaceLine); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelCollectionTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelCollectionTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelCollectionTest.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,81 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using Core.Common.Base; +using NUnit.Framework; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; + +namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile +{ + [TestFixture] + public class StochasticSoilModelCollectionTest : + CustomObservableUniqueItemCollectionWithSourcePathTestFixtureBase< + ObservableUniqueItemCollectionWithSourcePath, StochasticSoilModel> + { + protected override ObservableUniqueItemCollectionWithSourcePath CreateCollection() + { + return new StochasticSoilModelCollection(); + } + + protected override IEnumerable UniqueElements() + { + yield return new StochasticSoilModel("Model A"); + yield return new StochasticSoilModel("Model B"); + } + + protected override IEnumerable SingleNonUniqueElements() + { + const string someName = "Soil model"; + yield return new StochasticSoilModel(someName); + yield return new StochasticSoilModel(someName); + } + + protected override IEnumerable MultipleNonUniqueElements() + { + const string someName = "Soil model"; + const string someOtherName = "Other soil model"; + yield return new StochasticSoilModel(someName); + yield return new StochasticSoilModel(someName); + yield return new StochasticSoilModel(someOtherName); + yield return new StochasticSoilModel(someOtherName); + yield return new StochasticSoilModel(someOtherName); + } + + protected override void AssertSingleNonUniqueElements(ArgumentException exception, IEnumerable itemsToAdd) + { + string someName = itemsToAdd.First().Name; + Assert.AreEqual("Stochastische ondergrondmodellen moeten een unieke naam hebben. " + + $"Gevonden dubbele elementen: {someName}.", exception.Message); + } + + protected override void AssertMultipleNonUniqueElements(ArgumentException exception, IEnumerable itemsToAdd) + { + string someName = itemsToAdd.First().Name; + string someOtherName = itemsToAdd.First(i => i.Name != someName).Name; + Assert.AreEqual("Stochastische ondergrondmodellen moeten een unieke naam hebben. " + + $"Gevonden dubbele elementen: {someName}, {someOtherName}.", exception.Message); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelExtensionsTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelExtensionsTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelExtensionsTest.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,126 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.Base.Geometry; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile +{ + [TestFixture] + public class StochasticSoilModelExtensionsTest + { + [Test] + public void IntersectsWithSurfaceLineGeometry_SoilModelNull_ThrowArgumentNullException() + { + // Setup + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(3.0, 5.0, 0.0), + new Point3D(3.0, 0.0, 1.0), + new Point3D(3.0, -5.0, 0.0) + }); + + StochasticSoilModel soilModel = null; + + // Call + TestDelegate test = () => soilModel.IntersectsWithSurfaceLineGeometry(surfaceLine); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("stochasticSoilModel", exception.ParamName); + } + + [Test] + public void IntersectsWithSurfaceLineGeometry_SurfaceLineNull_ThrowArgumentNullException() + { + // Setup + var soilModel = new StochasticSoilModel("A"); + soilModel.Geometry.AddRange(new[] + { + new Point2D(1.0, 0.0), + new Point2D(5.0, 0.0) + }); + + // Call + TestDelegate test = () => soilModel.IntersectsWithSurfaceLineGeometry(null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("surfaceLine", exception.ParamName); + } + + [Test] + public void IntersectsWithSurfaceLineGeometry_SurfaceLineIntersectingSoilModel_ReturnTrue() + { + // Setup + var soilModel = new StochasticSoilModel("A"); + soilModel.Geometry.AddRange(new[] + { + new Point2D(1.0, 0.0), + new Point2D(5.0, 0.0) + }); + + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(3.0, 5.0, 0.0), + new Point3D(3.0, 0.0, 1.0), + new Point3D(3.0, -5.0, 0.0) + }); + + // Call + bool intersecting = soilModel.IntersectsWithSurfaceLineGeometry(surfaceLine); + + // Assert + Assert.IsTrue(intersecting); + } + + [Test] + public void IntersectsWithSurfaceLineGeometry_SurfaceLineNotIntersectingSoilModel_ReturnFalse() + { + // Setup + var soilModel = new StochasticSoilModel("A"); + soilModel.Geometry.AddRange(new[] + { + new Point2D(1.0, 0.0), + new Point2D(5.0, 0.0) + }); + + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + surfaceLine.SetGeometry(new[] + { + new Point3D(0.0, 1.0, 0.0), + new Point3D(2.5, 1.0, 1.0), + new Point3D(5.0, 1.0, 0.0) + }); + + // Call + bool intersecting = soilModel.IntersectsWithSurfaceLineGeometry(surfaceLine); + + // Assert + Assert.IsFalse(intersecting); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilModelTest.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,462 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using Core.Common.Base; +using Core.Common.Base.Geometry; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile +{ + [TestFixture] + public class StochasticSoilModelTest + { + [Test] + public void Constructor_WithoutName_ExpectedValues() + { + // Call + TestDelegate test = () => new StochasticSoilModel(null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("name", exception.ParamName); + } + + [Test] + [TestCase("")] + [TestCase("segmentSoilModelName")] + public void Constructor_WithName_ExpectedValues(string segmentSoilModelName) + { + // Call + var stochasticSoilModel = new StochasticSoilModel(segmentSoilModelName); + + // Assert + Assert.IsInstanceOf(stochasticSoilModel); + Assert.AreEqual(segmentSoilModelName, stochasticSoilModel.Name); + CollectionAssert.IsEmpty(stochasticSoilModel.Geometry); + CollectionAssert.IsEmpty(stochasticSoilModel.StochasticSoilProfiles); + } + + [Test] + public void PropertySegmentPoints_Always_ReturnsExpectedValues() + { + // Setup + const string expectedSegmentSoilModelName = "someSegmentSoilModelName"; + var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelName); + var point2D = new Point2D(1.0, 2.0); + + // Call + stochasticSoilModel.Geometry.Add(point2D); + + // Assert + Assert.AreEqual(expectedSegmentSoilModelName, stochasticSoilModel.Name); + Assert.AreEqual(1, stochasticSoilModel.Geometry.Count); + Assert.AreEqual(point2D, stochasticSoilModel.Geometry[0]); + } + + [Test] + public void PropertyStochasticSoilProfileProbabilities_Always_ReturnsExpectedValues() + { + // Setup + const string expectedSegmentSoilModelName = "someSegmentSoilModelName"; + var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelName); + + var mockRepository = new MockRepository(); + var stochasticSoilProfileProbability = mockRepository.StrictMock(1.0, null, null); + mockRepository.ReplayAll(); + + // Call + stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfileProbability); + + // Assert + Assert.AreEqual(expectedSegmentSoilModelName, stochasticSoilModel.Name); + Assert.AreEqual(1, stochasticSoilModel.StochasticSoilProfiles.Count); + Assert.AreEqual(stochasticSoilProfileProbability, stochasticSoilModel.StochasticSoilProfiles[0]); + mockRepository.VerifyAll(); + } + + [Test] + public void Update_WithNullModel_ThrowsArgumentNullException() + { + // Setup + var model = new StochasticSoilModel("name"); + + // Call + TestDelegate test = () => model.Update(null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("fromModel", paramName); + } + + [Test] + public void Update_ModelWithUpdatedProperties_PropertiesUpdated() + { + // Setup + var model = new StochasticSoilModel("name"); + model.Geometry.AddRange(new[] + { + new Point2D(1, 2), + new Point2D(4, 5) + }); + + const string expectedName = "otherName"; + var expectedGeometry = new[] + { + new Point2D(4, 2) + }; + + var otherModel = new StochasticSoilModel(expectedName); + otherModel.Geometry.AddRange(expectedGeometry); + + // Call + StochasticSoilModelProfileDifference difference = model.Update(otherModel); + + // Assert + Assert.AreEqual(expectedName, model.Name); + CollectionAssert.AreEqual(expectedGeometry, model.Geometry); + + CollectionAssert.IsEmpty(difference.AddedProfiles); + CollectionAssert.IsEmpty(difference.UpdatedProfiles); + CollectionAssert.IsEmpty(difference.RemovedProfiles); + } + + [Test] + public void Update_ModelWithAddedProfile_ProfileAdded() + { + // Setup + StochasticSoilModel model = CreateEmptyModel(); + StochasticSoilModel otherModel = CreateEmptyModel(); + var expectedAddedProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = new TestSoilProfile() + }; + otherModel.StochasticSoilProfiles.Add(expectedAddedProfile); + + // Call + StochasticSoilModelProfileDifference difference = model.Update(otherModel); + + // Assert + Assert.AreEqual(1, otherModel.StochasticSoilProfiles.Count); + Assert.AreEqual(expectedAddedProfile, otherModel.StochasticSoilProfiles[0]); + + CollectionAssert.AreEqual(new[] + { + expectedAddedProfile + }, difference.AddedProfiles); + CollectionAssert.IsEmpty(difference.UpdatedProfiles); + CollectionAssert.IsEmpty(difference.RemovedProfiles); + } + + [Test] + public void Update_ModelWithUpdatedProfile_ProfileUpdated() + { + // Setup + const string profileName = "A"; + var expectedUpdatedProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5) + }; + StochasticSoilModel model = CreateEmptyModel(); + model.StochasticSoilProfiles.Add(expectedUpdatedProfile); + StochasticSoilModel otherModel = CreateEmptyModel(); + otherModel.StochasticSoilProfiles.Add(new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -1, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5) + }); + + // Call + StochasticSoilModelProfileDifference difference = model.Update(otherModel); + + // Assert + Assert.AreEqual(1, otherModel.StochasticSoilProfiles.Count); + Assert.AreEqual(expectedUpdatedProfile, otherModel.StochasticSoilProfiles[0]); + + CollectionAssert.IsEmpty(difference.AddedProfiles); + CollectionAssert.AreEqual(new[] + { + expectedUpdatedProfile + }, difference.UpdatedProfiles); + CollectionAssert.IsEmpty(difference.RemovedProfiles); + } + + [Test] + public void Update_ModelWithUpdatedStochasticSoilProfile_ProfileUpdated() + { + // Setup + const string profileName = "A"; + var soilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5); + var expectedUpdatedProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = soilProfile + }; + StochasticSoilModel model = CreateEmptyModel(); + model.StochasticSoilProfiles.Add(expectedUpdatedProfile); + + StochasticSoilModel otherModel = CreateEmptyModel(); + otherModel.StochasticSoilProfiles.Add(new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = soilProfile + }); + + // Call + StochasticSoilModelProfileDifference difference = model.Update(otherModel); + + // Assert + CollectionAssert.IsEmpty(difference.AddedProfiles); + CollectionAssert.AreEqual(new[] + { + expectedUpdatedProfile + }, difference.UpdatedProfiles); + CollectionAssert.IsEmpty(difference.RemovedProfiles); + } + + [Test] + public void Update_ModelWithRemovedProfile_ProfileRemoved() + { + // Setup + const string profileName = "A"; + var soilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5); + var expectedRemovedProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = soilProfile + }; + StochasticSoilModel model = CreateEmptyModel(); + model.StochasticSoilProfiles.Add(expectedRemovedProfile); + + StochasticSoilModel otherModel = CreateEmptyModel(); + + // Call + StochasticSoilModelProfileDifference difference = model.Update(otherModel); + + // Assert + CollectionAssert.IsEmpty(difference.AddedProfiles); + CollectionAssert.IsEmpty(difference.UpdatedProfiles); + CollectionAssert.AreEqual(new[] + { + expectedRemovedProfile + }, difference.RemovedProfiles); + } + + [Test] + public void Update_ModelWithRemovedProfileSameNameOtherType_ProfileRemoved() + { + // Setup + const string profileName = "A"; + var soilProfile = new MacroStabilityInwardsSoilProfile1D(profileName, -2, CreateLayers1D(), SoilProfileType.SoilProfile1D, -5); + var expectedRemovedProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = soilProfile + }; + var newProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile2D, 3) + { + SoilProfile = new MacroStabilityInwardsSoilProfile2D(profileName, CreateLayers2D(), SoilProfileType.SoilProfile2D, -5) + }; + StochasticSoilModel model = CreateEmptyModel(); + model.StochasticSoilProfiles.Add(expectedRemovedProfile); + + StochasticSoilModel otherModel = CreateEmptyModel(); + otherModel.StochasticSoilProfiles.Add(newProfile); + + // Call + StochasticSoilModelProfileDifference difference = model.Update(otherModel); + + // Assert + CollectionAssert.AreEqual(new[] + { + newProfile + }, difference.AddedProfiles); + CollectionAssert.IsEmpty(difference.UpdatedProfiles); + CollectionAssert.AreEqual(new[] + { + expectedRemovedProfile + }, difference.RemovedProfiles); + } + + [Test] + public void Update_WithOtherModel_PropertiesUpdated() + { + // Setup + const string equalProfileName = "nameA"; + StochasticSoilModel model = CreateEmptyModel(); + + var stochasticProfileA = new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -11) + { + SoilProfile = CreateMacroStabilityInwardsSoilProfile1D(equalProfileName) + }; + var stochasticProfileB = new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, -52) + { + SoilProfile = CreateMacroStabilityInwardsSoilProfile1D("nameB") + }; + model.StochasticSoilProfiles.Add(stochasticProfileA); + model.StochasticSoilProfiles.Add(stochasticProfileB); + + const string otherName = "other name"; + var otherModel = new StochasticSoilModel(otherName); + + var otherPointA = new Point2D(2, 0); + var otherPointB = new Point2D(3, 0); + otherModel.Geometry.Add(otherPointA); + otherModel.Geometry.Add(otherPointB); + + var otherStochasticProfileA = new StochasticSoilProfile(0.7, SoilProfileType.SoilProfile1D, -1) + { + SoilProfile = new MacroStabilityInwardsSoilProfile1D(equalProfileName, -1, new[] + { + new MacroStabilityInwardsSoilLayer1D(0) + }, SoilProfileType.SoilProfile1D, -1) + }; + var otherStochasticProfileB = new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, -2) + { + SoilProfile = CreateMacroStabilityInwardsSoilProfile1D("other profile name") + }; + otherModel.StochasticSoilProfiles.Add(otherStochasticProfileA); + otherModel.StochasticSoilProfiles.Add(otherStochasticProfileB); + + // Call + StochasticSoilModelProfileDifference difference = model.Update(otherModel); + + // Assert + Assert.AreEqual(otherName, model.Name); + Assert.AreSame(otherPointA, model.Geometry[0]); + Assert.AreSame(otherPointB, model.Geometry[1]); + Assert.AreEqual(2, model.StochasticSoilProfiles.Count); + Assert.AreSame(stochasticProfileA, model.StochasticSoilProfiles[0]); + Assert.AreSame(otherStochasticProfileA.SoilProfile, model.StochasticSoilProfiles[0].SoilProfile); + Assert.AreNotSame(stochasticProfileB, model.StochasticSoilProfiles[1]); + Assert.AreSame(otherStochasticProfileB.SoilProfile, model.StochasticSoilProfiles[1].SoilProfile); + + CollectionAssert.AreEqual(new[] + { + stochasticProfileA + }, difference.UpdatedProfiles); + CollectionAssert.AreEqual(new[] + { + stochasticProfileB + }, difference.RemovedProfiles); + CollectionAssert.AreEqual(new[] + { + otherStochasticProfileB + }, difference.AddedProfiles); + } + + [Test] + public void Update_ModelsWithAddedProfilesWithSameNames_ThrowsInvalidOperationException() + { + // Setup + var addedProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() + }; + StochasticSoilModel otherModel = CreateEmptyModel(); + otherModel.StochasticSoilProfiles.Add(addedProfile); + + var existingProfile = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 3) + { + SoilProfile = new TestMacroStabilityInwardsSoilProfile1D() + }; + StochasticSoilModel model = CreateEmptyModel(); + model.StochasticSoilProfiles.Add(existingProfile); + model.StochasticSoilProfiles.Add(existingProfile); + + // Call + TestDelegate call = () => model.Update(otherModel); + + // Assert + Assert.Throws(call); + + Assert.AreEqual(1, otherModel.StochasticSoilProfiles.Count); + Assert.AreEqual(addedProfile, otherModel.StochasticSoilProfiles[0]); + + Assert.AreEqual(2, model.StochasticSoilProfiles.Count); + CollectionAssert.AreEqual(new[] + { + existingProfile, + existingProfile + }, model.StochasticSoilProfiles); + } + + [Test] + [TestCase("")] + [TestCase("some name")] + public void ToString_WithName_ReturnsName(string name) + { + // Setup + var stochasticSoilModel = new StochasticSoilModel(name); + + // Call & Assert + Assert.AreEqual(name, stochasticSoilModel.ToString()); + } + + private static ISoilProfile CreateMacroStabilityInwardsSoilProfile1D(string name) + { + return new MacroStabilityInwardsSoilProfile1D(name, 0.0, new Collection + { + new MacroStabilityInwardsSoilLayer1D(0.0) + { + Properties = + { + IsAquifer = true + } + } + }, SoilProfileType.SoilProfile1D, 0); + } + + private class TestSoilProfile : ISoilProfile + { + public string Name { get; } = ""; + } + + private static IEnumerable CreateLayers1D() + { + return new[] + { + new MacroStabilityInwardsSoilLayer1D(2) + }; + } + + private static IEnumerable CreateLayers2D() + { + var outerRing = new Ring(new[] + { + new Point2D(3, 2), + new Point2D(3, 5) + }); + return new[] + { + new MacroStabilityInwardsSoilLayer2D(outerRing, Enumerable.Empty().ToArray()) + }; + } + + private static StochasticSoilModel CreateEmptyModel() + { + var model = new StochasticSoilModel("name"); + return model; + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilProfileTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilProfileTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/StochasticSoilProfileTest.cs (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -0,0 +1,355 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.Base; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.Test.SoilProfile +{ + [TestFixture] + public class StochasticSoilProfileTest + { + private static readonly Random profileIdRandom = new Random(32); + + [Test] + [TestCase(0.1, SoilProfileType.SoilProfile1D, 123L)] + [TestCase(0.26, SoilProfileType.SoilProfile2D, 123L)] + public void Constructor_WithValidProbabilities_ExpectedValues(double probability, SoilProfileType soilProfileType, long soilProfileId) + { + // Call + var stochasticSoilProfileProbability = new StochasticSoilProfile(probability, soilProfileType, soilProfileId); + + // Assert + Assert.IsInstanceOf(stochasticSoilProfileProbability); + Assert.AreEqual(probability, stochasticSoilProfileProbability.Probability); + Assert.AreEqual(soilProfileType, stochasticSoilProfileProbability.SoilProfileType); + Assert.AreEqual(soilProfileId, stochasticSoilProfileProbability.SoilProfileId); + } + + [Test] + [SetCulture("nl-NL")] + [TestCase(12.5)] + [TestCase(1 + 1e-6)] + [TestCase(0 - 1e-6)] + [TestCase(-66.3)] + [TestCase(double.NaN)] + public void Constructor_WithInvalidProbabilities_ThrowsArgumentOutOfRangeException(double probability) + { + // Call + TestDelegate test = () => new StochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, -1); + + // Assert + const string expectedMessage = "Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + } + + [Test] + [TestCase(0)] + [TestCase(0.23)] + [TestCase(0.41)] + public void AddProbability_DifferentValues_ProbabilityIncreasedAsExpected(double probabilityToAdd) + { + // Setup + double startProbability = new Random(21).NextDouble() * 0.5; + var profile = new StochasticSoilProfile(startProbability, SoilProfileType.SoilProfile1D, -1); + + // Call + profile.AddProbability(probabilityToAdd); + + // Assert + Assert.AreEqual(startProbability + probabilityToAdd, profile.Probability); + } + + [Test] + [SetCulture("nl-NL")] + [TestCase(double.MaxValue)] + [TestCase(double.MinValue)] + [TestCase(1.0)] + [TestCase(-1.0)] + [TestCase(double.NaN)] + public void AddProbability_DifferentValuesMakingProbabilityInvalid_ThrowsArgumentOutOfRangeException(double probabilityToAdd) + { + // Setup + double startProbability = new Random(21).NextDouble() * 0.5; + var profile = new StochasticSoilProfile(startProbability, SoilProfileType.SoilProfile1D, -1); + + // Call + TestDelegate test = () => profile.AddProbability(probabilityToAdd); + + // Assert + const string expectedMessage = "Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik [0,0, 1,0] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + Assert.AreEqual(startProbability, profile.Probability); + } + + [Test] + public void Update_WithNullProfile_ThrowsArgumentNullException() + { + // Setup + var stochasticProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0); + + // Call + TestDelegate test = () => stochasticProfile.Update(null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("fromProfile", paramName); + } + + [Test] + [TestCaseSource(nameof(StochasticProfileUnequalCombinations))] + public void Update_WithValidProfile_UpdatesProperties(StochasticSoilProfile stochasticProfile, StochasticSoilProfile otherStochasticProfile) + { + // Call + bool updated = stochasticProfile.Update(otherStochasticProfile); + + // Assert + Assert.IsTrue(updated); + Assert.AreEqual(otherStochasticProfile.Probability, stochasticProfile.Probability); + Assert.AreEqual(otherStochasticProfile.SoilProfileType, stochasticProfile.SoilProfileType); + Assert.AreSame(otherStochasticProfile.SoilProfile, stochasticProfile.SoilProfile); + } + + [Test] + public void Update_WithEqualProfile_ReturnsFalse() + { + // Setup + const double probability = 1.0; + var profile = new TestSoilProfile(); + var stochasticProfile = new StochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, 0) + { + SoilProfile = profile + }; + + var otherStochasticProfile = new StochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, 0) + { + SoilProfile = profile + }; + + // Precondition + Assert.AreEqual(stochasticProfile, otherStochasticProfile); + + // Call + bool updated = stochasticProfile.Update(otherStochasticProfile); + + // Assert + Assert.IsFalse(updated); + Assert.AreEqual(probability, stochasticProfile.Probability); + Assert.AreSame(profile, stochasticProfile.SoilProfile); + } + + [Test] + public void Equals_OtherType_ReturnsFalse() + { + // Setup + var stochasticProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0); + + // Call + bool areEqual = stochasticProfile.Equals(new object()); + + // Assert + Assert.IsFalse(areEqual); + } + + [Test] + public void Equals_Null_ReturnsFalse() + { + // Setup + var stochasticProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0); + + // Call + bool areEqual = stochasticProfile.Equals(null); + + // Assert + Assert.IsFalse(areEqual); + } + + [Test] + [TestCaseSource(nameof(StochasticProfileCombinations))] + public void Equals_DifferentScenarios_ReturnsExpectedResult(StochasticSoilProfile profile, StochasticSoilProfile otherProfile, bool expectedEqual) + { + // Call + bool areEqualOne = profile.Equals(otherProfile); + bool areEqualTwo = otherProfile.Equals(profile); + + // Assert + Assert.AreEqual(expectedEqual, areEqualOne); + Assert.AreEqual(expectedEqual, areEqualTwo); + } + + [Test] + public void GetHashCode_EqualStochasticSoilProfile_ReturnSameHashCode() + { + // Setup + var stochasticSoilProfileA = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 234); + var stochasticSoilProfileB = new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 234); + + // Call + int hashCodeOne = stochasticSoilProfileA.GetHashCode(); + int hashCodeTwo = stochasticSoilProfileB.GetHashCode(); + + // Assert + Assert.AreEqual(hashCodeOne, hashCodeTwo); + } + + [Test] + public void ToString_WithProfile_ReturnsToStringResultOfProfile() + { + // Setup + var profile = new TestSoilProfile(); + var stochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) + { + SoilProfile = profile + }; + + // Call + string text = stochasticSoilProfile.ToString(); + + // Assert + Assert.AreEqual(profile.ToString(), text); + } + + private static TestCaseData[] StochasticProfileUnequalCombinations() + { + var stochasticSoilProfile = new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 0); + var otherStochasticSoilProfileA = new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 0); + var otherStochasticSoilProfileB = new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile2D, 0); + + return new[] + { + new TestCaseData(stochasticSoilProfile, otherStochasticSoilProfileA) + { + TestName = "Update_ProfileWithProfileA_UpdatesProperties" + }, + new TestCaseData(stochasticSoilProfile, otherStochasticSoilProfileB) + { + TestName = "Update_ProfileWithProfileB_UpdatesProperties" + } + }; + } + + private static TestCaseData[] StochasticProfileCombinations() + { + StochasticSoilProfile profileA = CreateRandomStochasticProfile(21); + StochasticSoilProfile profileB = CreateRandomStochasticProfile(21); + StochasticSoilProfile profileC = CreateRandomStochasticProfile(73); + StochasticSoilProfile profileD = CreateRandomStochasticProfile(21); + var profileE = new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 25); + var profileF = new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 45); + var profileG = new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile2D, 25); + var profileH = new StochasticSoilProfile(0.15, SoilProfileType.SoilProfile1D, 25); + var profileI = new StochasticSoilProfile(0.15, SoilProfileType.SoilProfile1D, 25) + { + SoilProfile = CreateRandomProfile(new Random(12)) + }; + var profileJ = new StochasticSoilProfile(0.15, SoilProfileType.SoilProfile1D, 25) + { + SoilProfile = CreateRandomProfile(new Random(32)) + }; + + return new[] + { + new TestCaseData(profileA, profileB, true) + { + TestName = "Equals_ProfileAProfileB_True" + }, + new TestCaseData(profileB, profileD, true) + { + TestName = "Equals_ProfileBProfileD_True" + }, + new TestCaseData(profileA, profileD, true) + { + TestName = "Equals_ProfileAProfileD_True" + }, + new TestCaseData(profileB, profileC, false) + { + TestName = "Equals_ProfileBProfileC_False" + }, + new TestCaseData(profileA, profileC, false) + { + TestName = "Equals_ProfileAProfileC_False" + }, + new TestCaseData(profileE, profileF, true) + { + TestName = "Equals_DifferentIds_True" + }, + new TestCaseData(profileE, profileG, false) + { + TestName = "Equals_DifferentTypes_False" + }, + new TestCaseData(profileE, profileH, false) + { + TestName = "Equals_DifferentProbability_False" + }, + new TestCaseData(profileI, profileJ, false) + { + TestName = "Equals_DifferentProfile_False" + } + }; + } + + private static StochasticSoilProfile CreateRandomStochasticProfile(int randomSeed) + { + var random = new Random(randomSeed); + return new StochasticSoilProfile(random.NextDouble(), random.NextEnumValue(), profileIdRandom.Next()) + { + SoilProfile = CreateRandomProfile(random) + }; + } + + private static TestSoilProfile CreateRandomProfile(Random random) + { + return new TestSoilProfile(GetRandomName(random)); + } + + private static string GetRandomName(Random random) + { + return new string('x', random.Next(0, 40)); + } + + private class TestSoilProfile : ISoilProfile + { + public TestSoilProfile() {} + + public TestSoilProfile(string name) + { + Name = name; + } + + public string Name { get; } + + public override int GetHashCode() + { + return 0; + } + + public override bool Equals(object obj) + { + var other = obj as ISoilProfile; + return other != null && Name.Equals(other.Name); + } + } + } +} \ No newline at end of file Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfileUnderSurfaceLineFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfileUnderSurfaceLineTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelCollectionTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 801944e042197afab2cf3bb57359970479e286b3 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilProfileTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestStochasticSoilModelTest.cs =================================================================== diff -u -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestStochasticSoilModelTest.cs (.../TestStochasticSoilModelTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestStochasticSoilModelTest.cs (.../TestStochasticSoilModelTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -21,6 +21,7 @@ using System.Linq; using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; namespace Ringtoets.MacroStabilityInwards.Data.TestUtil.Test { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs (.../MacroStabilityInwardsCalculationScenarioFactory.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,6 +26,7 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs (.../MacroStabilityInwardsInputFactory.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsInputFactory.cs (.../MacroStabilityInwardsInputFactory.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -20,6 +20,7 @@ // All rights reserved. using Core.Common.Base.Geometry; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Data.TestUtil Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -23,6 +23,7 @@ using Core.Common.Base.Geometry; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs (.../MacroStabilityInwardsTestDataGeneratorHelper.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGeneratorHelper.cs (.../MacroStabilityInwardsTestDataGeneratorHelper.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -23,6 +23,7 @@ using System.Linq; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Data.TestUtil Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs =================================================================== diff -u -r564a695798dd77c0b90bba14c902c6caefb7786f -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 564a695798dd77c0b90bba14c902c6caefb7786f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.Factories; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Forms.Test Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationGroupContextTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationGroupContextTest.cs (.../MacroStabilityInwardsCalculationGroupContextTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationGroupContextTest.cs (.../MacroStabilityInwardsCalculationGroupContextTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -25,6 +25,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsCalculationScenarioContextTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsContextTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsContextTest.cs (.../MacroStabilityInwardsContextTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/MacroStabilityInwardsContextTest.cs (.../MacroStabilityInwardsContextTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/StochasticSoilModelCollectionContextTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/StochasticSoilModelCollectionContextTest.cs (.../StochasticSoilModelCollectionContextTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PresentationObjects/StochasticSoilModelCollectionContextTest.cs (.../StochasticSoilModelCollectionContextTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -25,6 +25,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; namespace Ringtoets.MacroStabilityInwards.Forms.Test.PresentationObjects Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r5c77968df3d50b52ec1285c1305f00833fd40a79 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 5c77968df3d50b52ec1285c1305f00833fd40a79) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -40,6 +40,7 @@ using Ringtoets.Common.Forms.TestUtil; using Ringtoets.Common.Forms.UITypeEditors; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelCollectionPropertiesTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelCollectionPropertiesTest.cs (.../StochasticSoilModelCollectionPropertiesTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelCollectionPropertiesTest.cs (.../StochasticSoilModelCollectionPropertiesTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -25,7 +25,7 @@ using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs =================================================================== diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision d47809e3a8fadff2be5b10056b79b16dc27eeca2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -25,7 +25,7 @@ using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs =================================================================== diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs (.../StochasticSoilProfilePropertiesTest.cs) (revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilProfilePropertiesTest.cs (.../StochasticSoilProfilePropertiesTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -23,7 +23,7 @@ using System.Linq; using Core.Common.Gui.PropertyBag; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -30,6 +30,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -30,6 +30,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextSurfaceLineSelectionEditorTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -30,6 +30,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Forms.UITypeEditors; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs =================================================================== diff -u -rbcdabbbbd7fae323c339fdabc8bcb390962ccbcc -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision bcdabbbbd7fae323c339fdabc8bcb390962ccbcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -32,6 +32,7 @@ using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.Common.Forms.TestUtil; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.Views; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -35,6 +35,7 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Views; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -41,6 +41,7 @@ using Ringtoets.Common.Forms.Views; using Ringtoets.Common.Utils.TypeConverters; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Views; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs (.../MacroStabilityInwardsInputViewTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -30,6 +30,7 @@ using Rhino.Mocks; using Ringtoets.Common.Forms.TestUtil; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Views; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -31,6 +31,7 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.IO.Configurations.Import; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Configurations; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Importers/StochasticSoilModelImporterTest.cs =================================================================== diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Importers/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -32,6 +32,7 @@ using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.IO.FileImporters.MessageProviders; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.IO.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; @@ -970,7 +971,7 @@ var strategy = mocks.StrictMock(); strategy.Expect(s => s.UpdateModelWithImportedData(Arg.Is.NotNull, - Arg.Is.Same(filePath) + Arg.Is.Same(filePath) )).Throw(new UpdateDataException("Exception message")); mocks.ReplayAll(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,7 +27,7 @@ using Core.Common.TestUtil; using Core.Common.Utils.Builders; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.SoilProfile; namespace Ringtoets.MacroStabilityInwards.IO.Test.SoilProfile Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs =================================================================== diff -u -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,7 +26,7 @@ using Core.Common.TestUtil; using Core.Common.Utils.Builders; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Exceptions; using Ringtoets.MacroStabilityInwards.IO.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.TestUtil.Test/TestStochasticSoilModelUpdateModelStrategyTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.TestUtil.Test/TestStochasticSoilModelUpdateModelStrategyTest.cs (.../TestStochasticSoilModelUpdateModelStrategyTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.TestUtil.Test/TestStochasticSoilModelUpdateModelStrategyTest.cs (.../TestStochasticSoilModelUpdateModelStrategyTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -24,7 +24,7 @@ using System.Linq; using Core.Common.Base; using NUnit.Framework; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.IO.Importers; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.TestUtil/TestStochasticSoilModelUpdateModelStrategy.cs =================================================================== diff -u -ra940166534b3dd6e778de2e7c8e7e5241f3d3381 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.TestUtil/TestStochasticSoilModelUpdateModelStrategy.cs (.../TestStochasticSoilModelUpdateModelStrategy.cs) (revision a940166534b3dd6e778de2e7c8e7e5241f3d3381) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.TestUtil/TestStochasticSoilModelUpdateModelStrategy.cs (.../TestStochasticSoilModelUpdateModelStrategy.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -22,7 +22,7 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.IO.Importers; namespace Ringtoets.MacroStabilityInwards.IO.TestUtil Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsCalculationsViewIntegrationTest.cs (.../MacroStabilityInwardsCalculationsViewIntegrationTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -29,6 +29,7 @@ using Ringtoets.Integration.Data; using Ringtoets.Integration.TestUtils; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Views; namespace Ringtoets.MacroStabilityInwards.Integration.Test Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextExportInfoTest.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationContextExportInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -29,6 +29,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.IO.Configurations; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextExportInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -29,6 +29,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.IO.Configurations; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -29,6 +29,7 @@ using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.IO.SurfaceLines; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs =================================================================== diff -u -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelReplaceDataStrategyTest.cs (.../StochasticSoilModelReplaceDataStrategyTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; @@ -554,7 +555,11 @@ "B", new[] { - new MacroStabilityInwardsSoilLayer2D(new Ring(new [] { new Point2D(3,2), new Point2D(4,5) }), Enumerable.Empty()) + new MacroStabilityInwardsSoilLayer2D(new Ring(new[] + { + new Point2D(3, 2), + new Point2D(4, 5) + }), Enumerable.Empty()) }, SoilProfileType.SoilProfile2D, 0) @@ -591,8 +596,8 @@ SoilProfile = new MacroStabilityInwardsSoilProfile2D( soilProfile.Name, soilProfile.Layers.Select(s => new MacroStabilityInwardsSoilLayer2D( - new Ring(s.OuterRing.Points.Select(p => new Point2D(p.Y - 1, p.Y))), - s.Holes)), + new Ring(s.OuterRing.Points.Select(p => new Point2D(p.Y - 1, p.Y))), + s.Holes)), soilProfile.SoilProfileType, soilProfile.MacroStabilityInwardsSoilProfileId) }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsCalculationGroupContextImportInfoTest.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsCalculationGroupContextImportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextImportInfoTest.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsCalculationGroupContextImportInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextImportInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -31,6 +31,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.IO.Configurations; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextImportInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -47,17 +47,6 @@ private ImportInfo importInfo; private MacroStabilityInwardsPlugin plugin; - public override void Setup() - { - plugin = new MacroStabilityInwardsPlugin(); - importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(MacroStabilityInwardsSurfaceLinesContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - } - [Test] public void Name_Always_ReturnExpectedName() { @@ -246,5 +235,16 @@ Assert.IsInstanceOf>(importer); mocks.VerifyAll(); } + + public override void Setup() + { + plugin = new MacroStabilityInwardsPlugin(); + importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(MacroStabilityInwardsSurfaceLinesContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs =================================================================== diff -u -r38499aa6936706c30ac12e481233d3f13545dd8b -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 38499aa6936706c30ac12e481233d3f13545dd8b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -33,6 +33,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.IO.Importers; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; @@ -46,17 +47,6 @@ private ImportInfo importInfo; private MacroStabilityInwardsPlugin plugin; - public override void Setup() - { - plugin = new MacroStabilityInwardsPlugin(); - importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - } - [Test] public void Name_Always_ReturnExpectedName() { @@ -240,5 +230,16 @@ Assert.IsInstanceOf(importer); mocks.VerifyAll(); } + + public override void Setup() + { + plugin = new MacroStabilityInwardsPlugin(); + importInfo = plugin.GetImportInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs =================================================================== diff -u -rd240a17fa742ff4c460dd12eb300e3196100ffab -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs (.../MacroStabilityInwardsPluginTest.cs) (revision d240a17fa742ff4c460dd12eb300e3196100ffab) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/MacroStabilityInwardsPluginTest.cs (.../MacroStabilityInwardsPluginTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Forms.Views; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs =================================================================== diff -u -rcd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision cd90ebf744fb74f0d4b0dd6ee06f9c39b5faf213) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/StochasticSoilModelCollectionContextPropertyInfoTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/StochasticSoilModelCollectionContextPropertyInfoTest.cs (.../StochasticSoilModelCollectionContextPropertyInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/StochasticSoilModelCollectionContextPropertyInfoTest.cs (.../StochasticSoilModelCollectionContextPropertyInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -26,6 +26,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -42,6 +42,7 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.TestUtil; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -42,6 +42,7 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Service.TestUtil; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r5c0da60fa22b23e4c560df3ed0c76956f0e60f21 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 5c0da60fa22b23e4c560df3ed0c76956f0e60f21) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -63,21 +63,6 @@ private MacroStabilityInwardsPlugin plugin; private TreeNodeInfo info; - public override void Setup() - { - mocks = new MockRepository(); - plugin = new MacroStabilityInwardsPlugin(); - info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(MacroStabilityInwardsFailureMechanismContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - mocks.VerifyAll(); - - base.TearDown(); - } - [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -820,5 +805,20 @@ } } } + + public override void Setup() + { + mocks = new MockRepository(); + plugin = new MacroStabilityInwardsPlugin(); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(MacroStabilityInwardsFailureMechanismContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + + base.TearDown(); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsInputContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsInputContextTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -29,6 +29,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -31,6 +31,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Primitives; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -44,21 +45,6 @@ private MacroStabilityInwardsPlugin plugin; private TreeNodeInfo info; - public override void Setup() - { - mocks = new MockRepository(); - plugin = new MacroStabilityInwardsPlugin(); - info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StochasticSoilModelCollectionContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - mocks.VerifyAll(); - - base.TearDown(); - } - [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -260,5 +246,20 @@ // Assert // Assert expectancies are called in TearDown() } + + public override void Setup() + { + mocks = new MockRepository(); + plugin = new MacroStabilityInwardsPlugin(); + info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(StochasticSoilModelCollectionContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + + base.TearDown(); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,7 +28,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; using FormsResources = Ringtoets.MacroStabilityInwards.Forms.Properties.Resources; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs =================================================================== diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs (.../StochasticSoilProfileTreeNodeInfoTest.cs) (revision 3178e116f5e59e03078d465efeb303c5e232c7bf) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs (.../StochasticSoilProfileTreeNodeInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,7 +27,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.Properties; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs (.../MacroStabilityInwardsSurfaceLinesContextUpdateInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -46,17 +46,6 @@ private UpdateInfo updateInfo; private MacroStabilityInwardsPlugin plugin; - public override void Setup() - { - plugin = new MacroStabilityInwardsPlugin(); - updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(MacroStabilityInwardsSurfaceLinesContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - } - [Test] public void Name_Always_ReturnExpectedName() { @@ -271,5 +260,16 @@ Assert.IsInstanceOf>(importer); mocks.VerifyAll(); } + + public override void Setup() + { + plugin = new MacroStabilityInwardsPlugin(); + updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(MacroStabilityInwardsSurfaceLinesContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/UpdateInfos/StochasticSoilModelCollectionContextUpdateInfoTest.cs (.../StochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -33,6 +33,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.IO.Importers; @@ -47,17 +48,6 @@ private UpdateInfo updateInfo; private MacroStabilityInwardsPlugin plugin; - public override void Setup() - { - plugin = new MacroStabilityInwardsPlugin(); - updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext)); - } - - public override void TearDown() - { - plugin.Dispose(); - } - [Test] public void Name_Always_ReturnExpectedName() { @@ -269,5 +259,16 @@ Assert.IsInstanceOf(importer); mocks.VerifyAll(); } + + public override void Setup() + { + plugin = new MacroStabilityInwardsPlugin(); + updateInfo = plugin.GetUpdateInfos().First(i => i.DataType == typeof(StochasticSoilModelCollectionContext)); + } + + public override void TearDown() + { + plugin.Dispose(); + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs (.../MacroStabilityInwardsCalculationsViewInfoTest.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsCalculationsViewInfoTest.cs (.../MacroStabilityInwardsCalculationsViewInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -28,6 +28,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Views; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs =================================================================== diff -u -r8b60c9e846480f3ffeeb263bfea5d3367bf6bee3 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 8b60c9e846480f3ffeeb263bfea5d3367bf6bee3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ViewInfos/MacroStabilityInwardsInputViewInfoTest.cs (.../MacroStabilityInwardsInputViewInfoTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.MacroStabilityInwards.Forms.Views; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Service; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil; using Ringtoets.MacroStabilityInwards.Primitives; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs =================================================================== diff -u -r07783a47e1cfb0bd793eaba29c7567cb17e0b367 -r801944e042197afab2cf3bb57359970479e286b3 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 07783a47e1cfb0bd793eaba29c7567cb17e0b367) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 801944e042197afab2cf3bb57359970479e286b3) @@ -21,6 +21,7 @@ using NUnit.Framework; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Service.Test