Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/MacroStabilityInwardsSlidingCurveResultCreator.cs =================================================================== diff -u -rdd2c47d012620dd990d481838fb7ee34a4572b48 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/MacroStabilityInwardsSlidingCurveResultCreator.cs (.../MacroStabilityInwardsSlidingCurveResultCreator.cs) (revision dd2c47d012620dd990d481838fb7ee34a4572b48) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/MacroStabilityInwardsSlidingCurveResultCreator.cs (.../MacroStabilityInwardsSlidingCurveResultCreator.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -29,57 +29,57 @@ namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators { /// - /// Creates instances. + /// Creates instances. /// public static class MacroStabilityInwardsSlidingCurveResultCreator { /// - /// Creates a based on the information + /// Creates a based on the information /// given in the . /// /// The output to create the result for. - /// A new with information + /// A new with information /// taken from the /// Thrown when /// is null. - public static MacroStabilityInwardsSlidingCurveResult Create(SlidingDualCircle slidingCurve) + public static UpliftVanSlidingCurveResult Create(SlidingDualCircle slidingCurve) { if (slidingCurve == null) { throw new ArgumentNullException(nameof(slidingCurve)); } - MacroStabilityInwardsSlidingCircleResult leftCircle = slidingCurve.LeftCircleIsActive ? CreateActiveCircle(slidingCurve) : CreatePassiveCircle(slidingCurve); - MacroStabilityInwardsSlidingCircleResult rightCircle = slidingCurve.LeftCircleIsActive ? CreatePassiveCircle(slidingCurve) : CreateActiveCircle(slidingCurve); + UpliftVanSlidingCircleResult leftCircle = slidingCurve.LeftCircleIsActive ? CreateActiveCircle(slidingCurve) : CreatePassiveCircle(slidingCurve); + UpliftVanSlidingCircleResult rightCircle = slidingCurve.LeftCircleIsActive ? CreatePassiveCircle(slidingCurve) : CreateActiveCircle(slidingCurve); - return new MacroStabilityInwardsSlidingCurveResult(leftCircle, rightCircle, CreateSlices(slidingCurve.Slices), + return new UpliftVanSlidingCurveResult(leftCircle, rightCircle, CreateSlices(slidingCurve.Slices), slidingCurve.HorizontalForce0, slidingCurve.HorizontalForce); } - private static MacroStabilityInwardsSlidingCircleResult CreateActiveCircle(SlidingDualCircle slidingCurve) + private static UpliftVanSlidingCircleResult CreateActiveCircle(SlidingDualCircle slidingCurve) { - return new MacroStabilityInwardsSlidingCircleResult(new Point2D(slidingCurve.ActiveCircle.X, slidingCurve.ActiveCircle.Z), + return new UpliftVanSlidingCircleResult(new Point2D(slidingCurve.ActiveCircle.X, slidingCurve.ActiveCircle.Z), slidingCurve.ActiveRadius, true, slidingCurve.ActiveForce0, slidingCurve.ActiveForce, slidingCurve.DrivingMomentActive, slidingCurve.ResistingMomentActive); } - private static MacroStabilityInwardsSlidingCircleResult CreatePassiveCircle(SlidingDualCircle slidingCurve) + private static UpliftVanSlidingCircleResult CreatePassiveCircle(SlidingDualCircle slidingCurve) { - return new MacroStabilityInwardsSlidingCircleResult(new Point2D(slidingCurve.PassiveCircle.X, slidingCurve.PassiveCircle.Z), + return new UpliftVanSlidingCircleResult(new Point2D(slidingCurve.PassiveCircle.X, slidingCurve.PassiveCircle.Z), slidingCurve.PassiveRadius, false, slidingCurve.PassiveForce0, slidingCurve.PassiveForce, slidingCurve.DrivingMomentPassive, slidingCurve.ResistingMomentPassive); } - private static IEnumerable CreateSlices(IEnumerable slidingCurveSlices) + private static IEnumerable CreateSlices(IEnumerable slidingCurveSlices) { return slidingCurveSlices.Select( slice => - new MacroStabilityInwardsSliceResult( + new UpliftVanSliceResult( new Point2D(slice.TopLeftX, slice.TopLeftZ), new Point2D(slice.TopRightX, slice.TopRightZ), new Point2D(slice.BottomLeftX, slice.BottomLeftZ), new Point2D(slice.BottomRightX, slice.BottomRightZ), - new MacroStabilityInwardsSliceResult.ConstructionProperties + new UpliftVanSliceResult.ConstructionProperties { Cohesion = slice.Cohesion, FrictionAngle = slice.Phi, Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/MacroStabilityInwardsUpliftVanCalculationGridResultCreator.cs =================================================================== diff -u -rdd2c47d012620dd990d481838fb7ee34a4572b48 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/MacroStabilityInwardsUpliftVanCalculationGridResultCreator.cs (.../MacroStabilityInwardsUpliftVanCalculationGridResultCreator.cs) (revision dd2c47d012620dd990d481838fb7ee34a4572b48) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/MacroStabilityInwardsUpliftVanCalculationGridResultCreator.cs (.../MacroStabilityInwardsUpliftVanCalculationGridResultCreator.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -27,36 +27,36 @@ namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators { /// - /// Creates instances. + /// Creates instances. /// public static class MacroStabilityInwardsUpliftVanCalculationGridResultCreator { /// - /// Creates a based on the information + /// Creates a based on the information /// given in the . /// /// The output to create the result for. - /// A new with information + /// A new with information /// taken from the /// Thrown when /// is null. - public static MacroStabilityInwardsUpliftVanCalculationGridResult Create(SlipPlaneUpliftVan slipPlaneUpliftVan) + public static UpliftVanCalculationGridResult Create(SlipPlaneUpliftVan slipPlaneUpliftVan) { if (slipPlaneUpliftVan == null) { throw new ArgumentNullException(nameof(slipPlaneUpliftVan)); } - MacroStabilityInwardsGridResult leftGrid = CreateGrid(slipPlaneUpliftVan.SlipPlaneLeftGrid); - MacroStabilityInwardsGridResult rightGrid = CreateGrid(slipPlaneUpliftVan.SlipPlaneRightGrid); + UpliftVanGridResult leftGrid = CreateGrid(slipPlaneUpliftVan.SlipPlaneLeftGrid); + UpliftVanGridResult rightGrid = CreateGrid(slipPlaneUpliftVan.SlipPlaneRightGrid); - return new MacroStabilityInwardsUpliftVanCalculationGridResult(leftGrid, rightGrid, slipPlaneUpliftVan.SlipPlaneTangentLine.BoundaryHeights + return new UpliftVanCalculationGridResult(leftGrid, rightGrid, slipPlaneUpliftVan.SlipPlaneTangentLine.BoundaryHeights .Select(tl => tl.Height)); } - private static MacroStabilityInwardsGridResult CreateGrid(SlipCircleGrid grid) + private static UpliftVanGridResult CreateGrid(SlipCircleGrid grid) { - return new MacroStabilityInwardsGridResult(grid.GridXLeft, grid.GridXRight, grid.GridZTop, grid.GridZBottom, grid.GridXNumber, grid.GridZNumber); + return new UpliftVanGridResult(grid.GridXLeft, grid.GridXRight, grid.GridZTop, grid.GridZBottom, grid.GridXNumber, grid.GridZNumber); } } } \ No newline at end of file Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/MacroStabilityInwardsGridResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/MacroStabilityInwardsSliceResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/MacroStabilityInwardsSlidingCircleResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/MacroStabilityInwardsSlidingCurveResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/MacroStabilityInwardsUpliftVanCalculationGridResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanCalculationGridResult.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanCalculationGridResult.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanCalculationGridResult.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,76 @@ +// 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.KernelWrapper.Result +{ + /// + /// The calculation grid result of an Uplift Van calculation. + /// + public class UpliftVanCalculationGridResult + { + /// + /// Creates a new instance of . + /// + /// The left grid of the result. + /// The right grid of the result. + /// The tangent lines of the result. + /// Thrown when any parameter is null. + public UpliftVanCalculationGridResult(UpliftVanGridResult leftGrid, + UpliftVanGridResult rightGrid, + IEnumerable tangentLines) + { + if (leftGrid == null) + { + throw new ArgumentNullException(nameof(leftGrid)); + } + if (rightGrid == null) + { + throw new ArgumentNullException(nameof(rightGrid)); + } + if (tangentLines == null) + { + throw new ArgumentNullException(nameof(tangentLines)); + } + + LeftGrid = leftGrid; + RightGrid = rightGrid; + TangentLines = tangentLines; + } + + /// + /// Gets the left grid result. + /// + public UpliftVanGridResult LeftGrid { get; } + + /// + /// Gets the right grid result. + /// + public UpliftVanGridResult RightGrid { get; } + + /// + /// Gets the tangent lines result. + /// + public IEnumerable TangentLines { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanGridResult.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanGridResult.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanGridResult.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,82 @@ +// 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. + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Result +{ + /// + /// The grid result of an Uplift Van calculation. + /// + public class UpliftVanGridResult + { + /// + /// Creates a new instance of . + /// + /// The left boundary of the grid. + /// The right boundary of the grid. + /// The top boundary of the grid. + /// The bottom boundary of the grid. + /// The number of horizontal points. + /// The number of vertical points. + public UpliftVanGridResult(double xLeft, double xRight, double zTop, double zBottom, int numberOfHorizontalPoints, int numberOfVerticalPoints) + { + XLeft = xLeft; + XRight = xRight; + ZTop = zTop; + ZBottom = zBottom; + NumberOfHorizontalPoints = numberOfHorizontalPoints; + NumberOfVerticalPoints = numberOfVerticalPoints; + } + + /// + /// Gets the left boundary. + /// [m] + /// + public double XLeft { get; } + + /// + /// Gets the right boundary. + /// [m] + /// + public double XRight { get; } + + /// + /// Gets the top boundary. + /// [m+NAP] + /// + public double ZTop { get; } + + /// + /// Gets the bottom boundary. + /// [m+NAP] + /// + public double ZBottom { get; } + + /// + /// Gets the number of horizontal points. + /// + public int NumberOfHorizontalPoints { get; } + + /// + /// Gets the number of vertical points. + /// + public int NumberOfVerticalPoints { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSliceResult.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSliceResult.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSliceResult.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,512 @@ +// 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; + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Result +{ + /// + /// The slice result of an Uplift Van calculation. + /// + public class UpliftVanSliceResult + { + /// + /// Creates a new instance of . + /// + /// The top left point of the slice. + /// The top right point of the slice. + /// The bottom left point of the slice. + /// The bottom right point of the slice. + /// The object containing the values for the properties + /// of the new . + /// Thrown when any parameter is null. + public UpliftVanSliceResult(Point2D topLeftPoint, Point2D topRightPoint, + Point2D bottomLeftPoint, Point2D bottomRightPoint, + ConstructionProperties properties) + { + if (topLeftPoint == null) + { + throw new ArgumentNullException(nameof(topLeftPoint)); + } + if (topRightPoint == null) + { + throw new ArgumentNullException(nameof(topRightPoint)); + } + if (bottomLeftPoint == null) + { + throw new ArgumentNullException(nameof(bottomLeftPoint)); + } + if (bottomRightPoint == null) + { + throw new ArgumentNullException(nameof(bottomRightPoint)); + } + if (properties == null) + { + throw new ArgumentNullException(nameof(properties)); + } + + TopLeftPoint = topLeftPoint; + TopRightPoint = topRightPoint; + BottomLeftPoint = bottomLeftPoint; + BottomRightPoint = bottomRightPoint; + + Cohesion = properties.Cohesion; + FrictionAngle = properties.FrictionAngle; + CriticalPressure = properties.CriticalPressure; + OverConsolidationRatio = properties.OverConsolidationRatio; + Pop = properties.Pop; + DegreeOfConsolidationPorePressureSoil = properties.DegreeOfConsolidationPorePressureSoil; + DegreeOfConsolidationPorePressureLoad = properties.DegreeOfConsolidationPorePressureLoad; + Dilatancy = properties.Dilatancy; + ExternalLoad = properties.ExternalLoad; + HydrostaticPorePressure = properties.HydrostaticPorePressure; + LeftForce = properties.LeftForce; + LeftForceAngle = properties.LeftForceAngle; + LeftForceY = properties.LeftForceY; + RightForce = properties.RightForce; + RightForceAngle = properties.RightForceAngle; + RightForceY = properties.RightForceY; + LoadStress = properties.LoadStress; + NormalStress = properties.NormalStress; + PorePressure = properties.PorePressure; + HorizontalPorePressure = properties.HorizontalPorePressure; + VerticalPorePressure = properties.VerticalPorePressure; + PiezometricPorePressure = properties.PiezometricPorePressure; + EffectiveStress = properties.EffectiveStress; + EffectiveStressDaily = properties.EffectiveStressDaily; + ExcessPorePressure = properties.ExcessPorePressure; + ShearStress = properties.ShearStress; + SoilStress = properties.SoilStress; + TotalPorePressure = properties.TotalPorePressure; + TotalStress = properties.TotalStress; + Weight = properties.Weight; + } + + /// + /// Gets the top left point. + /// + public Point2D TopLeftPoint { get; } + + /// + /// Gets the top right point. + /// + public Point2D TopRightPoint { get; } + + /// + /// Gets the bottom left point. + /// + public Point2D BottomLeftPoint { get; } + + /// + /// Gets the bottom right point. + /// + public Point2D BottomRightPoint { get; } + + /// + /// Gets the cohesion. + /// [kN/m²] + /// + public double Cohesion { get; } + + /// + /// Gets the friction angle. + /// [°] + /// + public double FrictionAngle { get; } + + /// + /// Gets the critical pressure. + /// + public double CriticalPressure { get; } + + /// + /// Gets the OCR. + /// [-] + /// + public double OverConsolidationRatio { get; } + + /// + /// Gets the POP. + /// [kN/m²] + /// + public double Pop { get; } + + /// + /// Gets the pore pressure from degree of consolidation soil. + /// [kN/m²] + /// + public double DegreeOfConsolidationPorePressureSoil { get; } + + /// + /// Gets the pore pressure from degree of consolidation load. + /// [kN/m²] + /// + public double DegreeOfConsolidationPorePressureLoad { get; } + + /// + /// Gets the dilatancy of the slice. + /// + public double Dilatancy { get; } + + /// + /// Gets the external load. + /// [kN/m²] + /// + public double ExternalLoad { get; } + + /// + /// Gets the hydrostatic pore pressure. + /// [kN/m²] + /// + public double HydrostaticPorePressure { get; } + + /// + /// Gets the left force. + /// + public double LeftForce { get; } + + /// + /// Gets the left force angle. + /// [°] + /// + public double LeftForceAngle { get; } + + /// + /// Gets the left force y. + /// + public double LeftForceY { get; } + + /// + /// Gets the right force. + /// + public double RightForce { get; } + + /// + /// Gets the right force angle. + /// [°] + /// + public double RightForceAngle { get; } + + /// + /// Gets the right force y. + /// + public double RightForceY { get; } + + /// + /// Gets the load stress. + /// [kN/m²] + /// + public double LoadStress { get; } + + /// + /// Gets the normal stress. + /// [kN/m²] + /// + public double NormalStress { get; } + + /// + /// Gets the pore pressure. + /// [kN/m²] + /// + public double PorePressure { get; } + + /// + /// Gets the horizontal pore pressure. + /// [kN/m²] + /// + public double HorizontalPorePressure { get; } + + /// + /// Gets the vertical pore pressure. + /// [kN/m²] + /// + public double VerticalPorePressure { get; } + + /// + /// Gets the piezometric pore pressure. + /// [kN/m²] + /// + public double PiezometricPorePressure { get; } + + /// + /// Gets the effective stress. + /// [kN/m²] + /// + public double EffectiveStress { get; } + + /// + /// Gets the daily effective stress. + /// [kN/m²] + /// + public double EffectiveStressDaily { get; } + + /// + /// Gets the excess pore pressure. + /// [kN/m²] + /// + public double ExcessPorePressure { get; } + + /// + /// Gets the shear stress. + /// [kN/m²] + /// + public double ShearStress { get; } + + /// + /// Gets the soil stress. + /// [kN/m²] + /// + public double SoilStress { get; } + + /// + /// Gets the total pore pressure. + /// [kN/m²] + /// + public double TotalPorePressure { get; } + + /// + /// Gets the total stress. + /// [kN/m²] + /// + public double TotalStress { get; } + + /// + /// Gets the weight. + /// [kN/m] + /// + public double Weight { get; } + + public class ConstructionProperties + { + /// + /// Creates a new instance of . + /// + public ConstructionProperties() + { + Cohesion = double.NaN; + FrictionAngle = double.NaN; + CriticalPressure = double.NaN; + OverConsolidationRatio = double.NaN; + Pop = double.NaN; + DegreeOfConsolidationPorePressureSoil = double.NaN; + DegreeOfConsolidationPorePressureLoad = double.NaN; + Dilatancy = double.NaN; + ExternalLoad = double.NaN; + HydrostaticPorePressure = double.NaN; + LeftForce = double.NaN; + LeftForceAngle = double.NaN; + LeftForceY = double.NaN; + RightForce = double.NaN; + RightForceAngle = double.NaN; + RightForceY = double.NaN; + LoadStress = double.NaN; + NormalStress = double.NaN; + PorePressure = double.NaN; + HorizontalPorePressure = double.NaN; + VerticalPorePressure = double.NaN; + PiezometricPorePressure = double.NaN; + EffectiveStress = double.NaN; + EffectiveStressDaily = double.NaN; + ExcessPorePressure = double.NaN; + ShearStress = double.NaN; + SoilStress = double.NaN; + TotalPorePressure = double.NaN; + TotalStress = double.NaN; + Weight = double.NaN; + } + + /// + /// Gets or sets the cohesion. + /// [kN/m²] + /// + public double Cohesion { internal get; set; } + + /// + /// Gets or sets the friction angle. + /// [°] + /// + public double FrictionAngle { internal get; set; } + + /// + /// Gets or sets the critical pressure. + /// + public double CriticalPressure { internal get; set; } + + /// + /// Gets or sets the OCR. + /// [-] + /// + public double OverConsolidationRatio { internal get; set; } + + /// + /// Gets or sets the POP. + /// [kN/m²] + /// + public double Pop { internal get; set; } + + /// + /// Gets or sets the pore pressure from degree of consolidation soil. + /// [kN/m²] + /// + public double DegreeOfConsolidationPorePressureSoil { internal get; set; } + + /// + /// Gets or sets the pore pressure from degree of consolidation load. + /// [kN/m²] + /// + public double DegreeOfConsolidationPorePressureLoad { internal get; set; } + + /// + /// Gets or sets the dilatancy of the slice. + /// + public double Dilatancy { internal get; set; } + + /// + /// Gets or sets the external load. + /// [kN/m²] + /// + public double ExternalLoad { internal get; set; } + + /// + /// Gets or sets the hydraostatic pore pressure. + /// [kN/m²] + /// + public double HydrostaticPorePressure { internal get; set; } + + /// + /// Gets or sets the left force. + /// + public double LeftForce { internal get; set; } + + /// + /// Gets or sets the left force angle. + /// [°] + /// + public double LeftForceAngle { internal get; set; } + + /// + /// Gets or sets the left force y. + /// + public double LeftForceY { internal get; set; } + + /// + /// Gets or sets the right force. + /// + public double RightForce { internal get; set; } + + /// + /// Gets or sets the right force angle. + /// [°] + /// + public double RightForceAngle { internal get; set; } + + /// + /// Gets or sets the right force y. + /// + public double RightForceY { internal get; set; } + + /// + /// Gets or sets the load stress. + /// [kN/m²] + /// + public double LoadStress { internal get; set; } + + /// + /// Gets or sets the normal stress. + /// [kN/m²] + /// + public double NormalStress { internal get; set; } + + /// + /// Gets or sets the pore pressure. + /// [kN/m²] + /// + public double PorePressure { internal get; set; } + + /// + /// Gets or sets the horizontal pore pressure. + /// [kN/m²] + /// + public double HorizontalPorePressure { internal get; set; } + + /// + /// Gets or sets the vertical pore pressure. + /// [kN/m²] + /// + public double VerticalPorePressure { internal get; set; } + + /// + /// Gets or sets the piezometric pore pressure. + /// [kN/m²] + /// + public double PiezometricPorePressure { internal get; set; } + + /// + /// Gets or sets the effective stress. + /// [kN/m²] + /// + public double EffectiveStress { internal get; set; } + + /// + /// Gets or sets the daily effective stress. + /// [kN/m²] + /// + public double EffectiveStressDaily { internal get; set; } + + /// + /// Gets or sets the excess pore pressure. + /// [kN/m²] + /// + public double ExcessPorePressure { internal get; set; } + + /// + /// Gets or sets the shear stress. + /// [kN/m²] + /// + public double ShearStress { internal get; set; } + + /// + /// Gets or sets the soil stress. + /// [kN/m²] + /// + public double SoilStress { internal get; set; } + + /// + /// Gets or sets the total pore pressure. + /// [kN/m²] + /// + public double TotalPorePressure { internal get; set; } + + /// + /// Gets or sets the total stress. + /// [kN/m²] + /// + public double TotalStress { internal get; set; } + + /// + /// Gets or sets the weight. + /// [kN/m] + /// + public double Weight { internal get; set; } + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSlidingCircleResult.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSlidingCircleResult.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSlidingCircleResult.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,96 @@ +// 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; + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Result +{ + /// + /// The sliding circle result of an Uplift Van calculation. + /// + public class UpliftVanSlidingCircleResult + { + /// + /// Creates a new instance of . + /// + /// The center coordinate of the circle. + /// The radius of the circle. + /// Indicator whether the circle is active or not. + /// The non iterated force of the circle. + /// The iterated force of the circle. + /// The driving moment of the circle. + /// The resisting moment of the circle. + /// Thrown when + /// is null. + public UpliftVanSlidingCircleResult(Point2D center, double radius, bool isActive, + double nonIteratedForce, double iteratedForce, + double drivingMoment, double resistingMoment) + { + if (center == null) + { + throw new ArgumentNullException(nameof(center)); + } + Center = center; + Radius = radius; + IsActive = isActive; + NonIteratedForce = nonIteratedForce; + IteratedForce = iteratedForce; + DrivingMoment = drivingMoment; + ResistingMoment = resistingMoment; + } + + /// + /// Gets the center coordinate of the circle. + /// + public Point2D Center { get; } + + /// + /// Gets the radius of the circle. + /// + public double Radius { get; } + + /// + /// Gets whether the circle is the active circle or not. + /// + public bool IsActive { get; } + + /// + /// Gets the non iterated force of the circle. + /// + public double NonIteratedForce { get; } + + /// + /// Gets the iterated force of the circle. + /// + public double IteratedForce { get; } + + /// + /// Gets the driving moment of the circle. + /// + public double DrivingMoment { get; } + + /// + /// Gets the resisting moment of the circle. + /// + public double ResistingMoment { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSlidingCurveResult.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSlidingCurveResult.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Result/UpliftVanSlidingCurveResult.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,92 @@ +// 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.KernelWrapper.Result +{ + /// + /// The sliding curve result of an Uplift Van calculation. + /// + public class UpliftVanSlidingCurveResult + { + /// + /// Creates a new instance of . + /// + /// The left circle of the curve. + /// The right circle of the curve. + /// The slices of the curve. + /// The non iterated horizontal + /// force of the curve. + /// The iterated horizontal force + /// of the curve. + /// Thrown when any parameter + /// is null. + public UpliftVanSlidingCurveResult(UpliftVanSlidingCircleResult leftCircle, UpliftVanSlidingCircleResult rightCircle, + IEnumerable slices, double nonIteratedHorizontalForce, double iteratedHorizontalForce) + { + if (leftCircle == null) + { + throw new ArgumentNullException(nameof(leftCircle)); + } + if (rightCircle == null) + { + throw new ArgumentNullException(nameof(rightCircle)); + } + if (slices == null) + { + throw new ArgumentNullException(nameof(slices)); + } + + LeftCircle = leftCircle; + RightCircle = rightCircle; + Slices = slices; + NonIteratedHorizontalForce = nonIteratedHorizontalForce; + IteratedHorizontalForce = iteratedHorizontalForce; + } + + /// + /// Gets the left circle. + /// + public UpliftVanSlidingCircleResult LeftCircle { get; } + + /// + /// Gets the right circle. + /// + public UpliftVanSlidingCircleResult RightCircle { get; } + + /// + /// Gets the slices. + /// + public IEnumerable Slices { get; } + + /// + /// Gets the non iterated horizontal force. + /// + public double NonIteratedHorizontalForce { get; } + + /// + /// Gets the iterated horizontal force. + /// + public double IteratedHorizontalForce { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj =================================================================== diff -u -r832f344292007108d1e7323891eacce5bd678c0e -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj) (revision 832f344292007108d1e7323891eacce5bd678c0e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -55,13 +55,13 @@ - - - - + + + + - + Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculatorResult.cs =================================================================== diff -u -r832f344292007108d1e7323891eacce5bd678c0e -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculatorResult.cs (.../UpliftVanCalculatorResult.cs) (revision 832f344292007108d1e7323891eacce5bd678c0e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/UpliftVanCalculatorResult.cs (.../UpliftVanCalculatorResult.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -36,8 +36,8 @@ /// The calculation grid result. /// The container of the properties for the . /// Thrown when any parameter is null. - internal UpliftVanCalculatorResult(MacroStabilityInwardsSlidingCurveResult slidingCurveResult, - MacroStabilityInwardsUpliftVanCalculationGridResult calculationGridResult, + internal UpliftVanCalculatorResult(UpliftVanSlidingCurveResult slidingCurveResult, + UpliftVanCalculationGridResult calculationGridResult, ConstructionProperties properties) { if (slidingCurveResult == null) @@ -116,12 +116,12 @@ /// /// Gets the sliding curve result. /// - public MacroStabilityInwardsSlidingCurveResult SlidingCurveResult { get; } + public UpliftVanSlidingCurveResult SlidingCurveResult { get; } /// /// Gets the calculation grid result. /// - public MacroStabilityInwardsUpliftVanCalculationGridResult CalculationGridResult { get; } + public UpliftVanCalculationGridResult CalculationGridResult { get; } /// /// Gets the factor of stability. Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlidingCurveConverter.cs =================================================================== diff -u -r9786acfc77036e9dde212b1c36cbc5457e1ff663 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlidingCurveConverter.cs (.../MacroStabilityInwardsSlidingCurveConverter.cs) (revision 9786acfc77036e9dde212b1c36cbc5457e1ff663) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlidingCurveConverter.cs (.../MacroStabilityInwardsSlidingCurveConverter.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -28,20 +28,20 @@ namespace Ringtoets.MacroStabilityInwards.Service.Converters { /// - /// Converter to convert + /// Converter to convert /// into . /// internal static class MacroStabilityInwardsSlidingCurveConverter { /// - /// Converts + /// Converts /// into . /// /// The result to convert. /// The converted . /// Thrown when /// is null. - public static MacroStabilityInwardsSlidingCurve Convert(MacroStabilityInwardsSlidingCurveResult result) + public static MacroStabilityInwardsSlidingCurve Convert(UpliftVanSlidingCurveResult result) { if (result == null) { @@ -55,7 +55,7 @@ return new MacroStabilityInwardsSlidingCurve(leftCircle, rightCircle, slices, result.NonIteratedHorizontalForce, result.IteratedHorizontalForce); } - private static MacroStabilityInwardsSlidingCircle ConvertCircle(MacroStabilityInwardsSlidingCircleResult circle) + private static MacroStabilityInwardsSlidingCircle ConvertCircle(UpliftVanSlidingCircleResult circle) { return new MacroStabilityInwardsSlidingCircle(circle.Center, circle.Radius, @@ -66,7 +66,7 @@ circle.ResistingMoment); } - private static IEnumerable ConvertSlices(IEnumerable slices) + private static IEnumerable ConvertSlices(IEnumerable slices) { return slices.Select(s => new MacroStabilityInwardsSlice( s.TopLeftPoint, Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs =================================================================== diff -u -r1b16d1bbb40c8246bd53a1dcfa7803cb92501915 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs) (revision 1b16d1bbb40c8246bd53a1dcfa7803cb92501915) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -28,20 +28,20 @@ namespace Ringtoets.MacroStabilityInwards.Service.Converters { /// - /// Converter to convert + /// Converter to convert /// into . /// internal static class MacroStabilityInwardsSlipPlaneUpliftVanConverter { /// - /// Converts + /// Converts /// into . /// /// The result to convert. /// The converted . /// Thrown when /// is null. - public static MacroStabilityInwardsSlipPlaneUpliftVan Convert(MacroStabilityInwardsUpliftVanCalculationGridResult result) + public static MacroStabilityInwardsSlipPlaneUpliftVan Convert(UpliftVanCalculationGridResult result) { if (result == null) { @@ -54,7 +54,7 @@ return new MacroStabilityInwardsSlipPlaneUpliftVan(leftGrid, rightGrid, result.TangentLines); } - private static MacroStabilityInwardsGrid ConvertGrid(MacroStabilityInwardsGridResult grid) + private static MacroStabilityInwardsGrid ConvertGrid(UpliftVanGridResult grid) { return new MacroStabilityInwardsGrid { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/MacroStabilityInwardsSlidingCurveResultCreatorTest.cs =================================================================== diff -u -rdd2c47d012620dd990d481838fb7ee34a4572b48 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/MacroStabilityInwardsSlidingCurveResultCreatorTest.cs (.../MacroStabilityInwardsSlidingCurveResultCreatorTest.cs) (revision dd2c47d012620dd990d481838fb7ee34a4572b48) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/MacroStabilityInwardsSlidingCurveResultCreatorTest.cs (.../MacroStabilityInwardsSlidingCurveResultCreatorTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -91,7 +91,7 @@ }; // Call - MacroStabilityInwardsSlidingCurveResult result = MacroStabilityInwardsSlidingCurveResultCreator.Create(slidingCurve); + UpliftVanSlidingCurveResult result = MacroStabilityInwardsSlidingCurveResultCreator.Create(slidingCurve); // Assert AssertActiveCircle(leftCircleIsActive ? result.LeftCircle : result.RightCircle, @@ -201,12 +201,12 @@ }; // Call - MacroStabilityInwardsSlidingCurveResult result = MacroStabilityInwardsSlidingCurveResultCreator.Create(slidingCurve); + UpliftVanSlidingCurveResult result = MacroStabilityInwardsSlidingCurveResultCreator.Create(slidingCurve); // Assert Assert.AreEqual(1, result.Slices.Count()); - MacroStabilityInwardsSliceResult slice = result.Slices.First(); + UpliftVanSliceResult slice = result.Slices.First(); Assert.AreEqual(new Point2D(topLeftX, topLeftZ), slice.TopLeftPoint); Assert.AreEqual(new Point2D(topRightX, topRightZ), slice.TopRightPoint); Assert.AreEqual(new Point2D(bottomLeftX, bottomLeftZ), slice.BottomLeftPoint); @@ -244,21 +244,21 @@ Assert.AreEqual(weight, slice.Weight); } - private static void AssertActiveCircle(MacroStabilityInwardsSlidingCircleResult circle, double x, double z, double iteratedForce, + private static void AssertActiveCircle(UpliftVanSlidingCircleResult circle, double x, double z, double iteratedForce, double nonIteratedForce, double radius, double drivingMoment, double resistingMoment) { Assert.IsTrue(circle.IsActive); AssertCircle(circle, x, z, iteratedForce, nonIteratedForce, radius, drivingMoment, resistingMoment); } - private static void AssertPassiveCircle(MacroStabilityInwardsSlidingCircleResult circle, double x, double z, double iteratedForce, + private static void AssertPassiveCircle(UpliftVanSlidingCircleResult circle, double x, double z, double iteratedForce, double nonIteratedForce, double radius, double drivingMoment, double resistingMoment) { Assert.IsFalse(circle.IsActive); AssertCircle(circle, x, z, iteratedForce, nonIteratedForce, radius, drivingMoment, resistingMoment); } - private static void AssertCircle(MacroStabilityInwardsSlidingCircleResult circle, double x, double z, double iteratedForce, + private static void AssertCircle(UpliftVanSlidingCircleResult circle, double x, double z, double iteratedForce, double nonIteratedForce, double radius, double drivingMoment, double resistingMoment) { Assert.AreEqual(x, circle.Center.X); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/MacroStabilityInwardsUpliftVanCalculationGridResultCreatorTest.cs =================================================================== diff -u -rdd2c47d012620dd990d481838fb7ee34a4572b48 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/MacroStabilityInwardsUpliftVanCalculationGridResultCreatorTest.cs (.../MacroStabilityInwardsUpliftVanCalculationGridResultCreatorTest.cs) (revision dd2c47d012620dd990d481838fb7ee34a4572b48) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/MacroStabilityInwardsUpliftVanCalculationGridResultCreatorTest.cs (.../MacroStabilityInwardsUpliftVanCalculationGridResultCreatorTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -95,7 +95,7 @@ }; // Call - MacroStabilityInwardsUpliftVanCalculationGridResult result = MacroStabilityInwardsUpliftVanCalculationGridResultCreator.Create(slipPlaneUpliftVan); + UpliftVanCalculationGridResult result = MacroStabilityInwardsUpliftVanCalculationGridResultCreator.Create(slipPlaneUpliftVan); // Assert AssertGrid(slipPlaneUpliftVan.SlipPlaneLeftGrid, result.LeftGrid); @@ -104,7 +104,7 @@ CollectionAssert.AreEqual(slipPlaneUpliftVan.SlipPlaneTangentLine.BoundaryHeights.Select(sl => sl.Height), result.TangentLines); } - private static void AssertGrid(SlipCircleGrid originalGrid, MacroStabilityInwardsGridResult actualGrid) + private static void AssertGrid(SlipCircleGrid originalGrid, UpliftVanGridResult actualGrid) { Assert.AreEqual(originalGrid.GridXLeft, actualGrid.XLeft); Assert.AreEqual(originalGrid.GridXRight, actualGrid.XRight); Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/MacroStabilityInwardsGridResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/MacroStabilityInwardsSliceResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/MacroStabilityInwardsSlidingCircleResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/MacroStabilityInwardsSlidingCurveResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 283274d59060df06800cc23bd00ea9a31535d174 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/MacroStabilityInwardsUpliftVanCalculationGridResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanCalculationGridResultTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanCalculationGridResultTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanCalculationGridResultTest.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,99 @@ +// 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.Linq; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.KernelWrapper.Result; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Result; + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Result +{ + [TestFixture] + public class UpliftVanCalculationGridResultTest + { + [Test] + public void Constructor_LeftGridNull_ThrowsArgumentNullException() + { + // Setup + UpliftVanGridResult grid = MacroStabilityInwardsGridResultTestFactory.Create(); + + // Call + TestDelegate call = () => new UpliftVanCalculationGridResult(null, grid, Enumerable.Empty()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("leftGrid", exception.ParamName); + } + + [Test] + public void Constructor_RightGridNull_ThrowsArgumentNullException() + { + // Setup + UpliftVanGridResult grid = MacroStabilityInwardsGridResultTestFactory.Create(); + + // Call + TestDelegate call = () => new UpliftVanCalculationGridResult(grid, null, Enumerable.Empty()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("rightGrid", exception.ParamName); + } + + [Test] + public void Constructor_TangentLinesNull_ThrowsArgumentNullException() + { + // Setup + UpliftVanGridResult leftGrid = MacroStabilityInwardsGridResultTestFactory.Create(); + UpliftVanGridResult rightGrid = MacroStabilityInwardsGridResultTestFactory.Create(); + + // Call + TestDelegate call = () => new UpliftVanCalculationGridResult(leftGrid, rightGrid, null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("tangentLines", exception.ParamName); + } + + [Test] + public void Constructor_ExpectedValues() + { + // Setup + UpliftVanGridResult leftGrid = MacroStabilityInwardsGridResultTestFactory.Create(); + UpliftVanGridResult rightGrid = MacroStabilityInwardsGridResultTestFactory.Create(); + var tangentLines = new[] + { + 0, + 1, + 1.5, + 2 + }; + + // Call + var result = new UpliftVanCalculationGridResult(leftGrid, rightGrid, tangentLines); + + // Assert + Assert.AreSame(leftGrid, result.LeftGrid); + Assert.AreSame(rightGrid, result.RightGrid); + CollectionAssert.AreEqual(tangentLines, result.TangentLines); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanGridResultTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanGridResultTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanGridResultTest.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,55 @@ +// 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 NUnit.Framework; +using Ringtoets.MacroStabilityInwards.KernelWrapper.Result; + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Result +{ + [TestFixture] + public class UpliftVanGridResultTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Setup + var random = new Random(21); + double xLeft = random.Next(); + double xRight = random.Next(); + double zTop = random.Next(); + double zBottom = random.Next(); + int nrOfHorizontalPoints = random.Next(); + int nrOfVerticalPoints = random.Next(); + + // Call + var gridResult = new UpliftVanGridResult(xLeft, xRight, zTop, zBottom, nrOfHorizontalPoints, nrOfVerticalPoints); + + // Assert + Assert.AreEqual(xLeft, gridResult.XLeft); + Assert.AreEqual(xRight, gridResult.XRight); + Assert.AreEqual(zTop, gridResult.ZTop); + Assert.AreEqual(zBottom, gridResult.ZBottom); + Assert.AreEqual(nrOfHorizontalPoints, gridResult.NumberOfHorizontalPoints); + Assert.AreEqual(nrOfVerticalPoints, gridResult.NumberOfVerticalPoints); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSliceResultTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSliceResultTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSliceResultTest.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,259 @@ +// 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.KernelWrapper.Result; + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Result +{ + [TestFixture] + public class UpliftVanSliceResultTest + { + [Test] + public void Constructor_TopLeftPointNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new UpliftVanSliceResult(null, new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), + new UpliftVanSliceResult.ConstructionProperties()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("topLeftPoint", exception.ParamName); + } + + [Test] + public void Constructor_TopRightPointNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new UpliftVanSliceResult(new Point2D(0, 0), null, new Point2D(0, 0), new Point2D(0, 0), + new UpliftVanSliceResult.ConstructionProperties()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("topRightPoint", exception.ParamName); + } + + [Test] + public void Constructor_BottomLeftPointNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new UpliftVanSliceResult(new Point2D(0, 0), new Point2D(0, 0), null, new Point2D(0, 0), + new UpliftVanSliceResult.ConstructionProperties()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("bottomLeftPoint", exception.ParamName); + } + + [Test] + public void Constructor_BottomRightPointNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new UpliftVanSliceResult(new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), null, + new UpliftVanSliceResult.ConstructionProperties()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("bottomRightPoint", exception.ParamName); + } + + [Test] + public void Constructor_ConstructionPropertiesNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new UpliftVanSliceResult(new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("properties", exception.ParamName); + } + + [Test] + public void Constructor_WithCoordinates_ExpectedValues() + { + // Setup + var topLeftPoint = new Point2D(0, 0); + var topRightPoint = new Point2D(1, 1); + var bottomLeftPoint = new Point2D(2, 2); + var bottomRightPoint = new Point2D(3, 3); + + // Call + var slice = new UpliftVanSliceResult(topLeftPoint, topRightPoint, bottomLeftPoint, bottomRightPoint, + new UpliftVanSliceResult.ConstructionProperties()); + + // Assert + Assert.AreEqual(topLeftPoint, slice.TopLeftPoint); + Assert.AreEqual(topRightPoint, slice.TopRightPoint); + Assert.AreEqual(bottomLeftPoint, slice.BottomLeftPoint); + Assert.AreEqual(bottomRightPoint, slice.BottomRightPoint); + } + + [Test] + public void Constructor_ConstructionPropertiesEmpty_ExpectedValues() + { + // Call + var slice = new UpliftVanSliceResult(new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), + new UpliftVanSliceResult.ConstructionProperties()); + + // Assert + Assert.IsNaN(slice.Cohesion); + Assert.IsNaN(slice.FrictionAngle); + Assert.IsNaN(slice.CriticalPressure); + Assert.IsNaN(slice.OverConsolidationRatio); + Assert.IsNaN(slice.Pop); + Assert.IsNaN(slice.DegreeOfConsolidationPorePressureSoil); + Assert.IsNaN(slice.DegreeOfConsolidationPorePressureLoad); + Assert.IsNaN(slice.Dilatancy); + Assert.IsNaN(slice.ExternalLoad); + Assert.IsNaN(slice.HydrostaticPorePressure); + Assert.IsNaN(slice.LeftForce); + Assert.IsNaN(slice.LeftForceAngle); + Assert.IsNaN(slice.LeftForceY); + Assert.IsNaN(slice.RightForce); + Assert.IsNaN(slice.RightForceAngle); + Assert.IsNaN(slice.RightForceY); + Assert.IsNaN(slice.LoadStress); + Assert.IsNaN(slice.NormalStress); + Assert.IsNaN(slice.PorePressure); + Assert.IsNaN(slice.HorizontalPorePressure); + Assert.IsNaN(slice.VerticalPorePressure); + Assert.IsNaN(slice.PiezometricPorePressure); + Assert.IsNaN(slice.EffectiveStress); + Assert.IsNaN(slice.EffectiveStressDaily); + Assert.IsNaN(slice.ExcessPorePressure); + Assert.IsNaN(slice.ShearStress); + Assert.IsNaN(slice.SoilStress); + Assert.IsNaN(slice.TotalPorePressure); + Assert.IsNaN(slice.TotalStress); + Assert.IsNaN(slice.Weight); + } + + [Test] + public void Constructor_ConstructionPropertiesSet_ExpectedValues() + { + // Setup + var random = new Random(21); + double cohesion = random.NextDouble(); + double frictionAngle = random.NextDouble(); + double criticalPressure = random.NextDouble(); + double overConsolidationRatio = random.NextDouble(); + double pop = random.NextDouble(); + double degreeOfConsolidationPorePressureSoil = random.NextDouble(); + double degreeOfConsolidationPorePressureLoad = random.NextDouble(); + double dilatancy = random.NextDouble(); + double externalLoad = random.NextDouble(); + double hydrostaticPorePressure = random.NextDouble(); + double leftForce = random.NextDouble(); + double leftForceAngle = random.NextDouble(); + double leftForceY = random.NextDouble(); + double rightForce = random.NextDouble(); + double rightForceAngle = random.NextDouble(); + double rightForceY = random.NextDouble(); + double loadStress = random.NextDouble(); + double normalStress = random.NextDouble(); + double porePressure = random.NextDouble(); + double horizontalPorePressure = random.NextDouble(); + double verticalPorePressure = random.NextDouble(); + double piezometricPorePressure = random.NextDouble(); + double effectiveStress = random.NextDouble(); + double effectiveStressDaily = random.NextDouble(); + double excessPorePressure = random.NextDouble(); + double shearStress = random.NextDouble(); + double soilStress = random.NextDouble(); + double totalPorePressure = random.NextDouble(); + double totalStress = random.NextDouble(); + double weight = random.NextDouble(); + + var properties = new UpliftVanSliceResult.ConstructionProperties + { + Cohesion = cohesion, + FrictionAngle = frictionAngle, + CriticalPressure = criticalPressure, + OverConsolidationRatio = overConsolidationRatio, + DegreeOfConsolidationPorePressureSoil = degreeOfConsolidationPorePressureSoil, + DegreeOfConsolidationPorePressureLoad = degreeOfConsolidationPorePressureLoad, + Pop = pop, + Dilatancy = dilatancy, + ExternalLoad = externalLoad, + HydrostaticPorePressure = hydrostaticPorePressure, + LeftForce = leftForce, + LeftForceAngle = leftForceAngle, + LeftForceY = leftForceY, + RightForce = rightForce, + RightForceAngle = rightForceAngle, + RightForceY = rightForceY, + LoadStress = loadStress, + NormalStress = normalStress, + PorePressure = porePressure, + HorizontalPorePressure = horizontalPorePressure, + VerticalPorePressure = verticalPorePressure, + PiezometricPorePressure = piezometricPorePressure, + EffectiveStress = effectiveStress, + EffectiveStressDaily = effectiveStressDaily, + ExcessPorePressure = excessPorePressure, + ShearStress = shearStress, + SoilStress = soilStress, + TotalPorePressure = totalPorePressure, + TotalStress = totalStress, + Weight = weight + }; + + // Call + var slice = new UpliftVanSliceResult(new Point2D(0, 0), new Point2D(0, 0), + new Point2D(0, 0), new Point2D(0, 0), + properties); + + // Assert + Assert.AreEqual(cohesion, slice.Cohesion); + Assert.AreEqual(frictionAngle, slice.FrictionAngle); + Assert.AreEqual(criticalPressure, slice.CriticalPressure); + Assert.AreEqual(overConsolidationRatio, slice.OverConsolidationRatio); + Assert.AreEqual(pop, slice.Pop); + Assert.AreEqual(degreeOfConsolidationPorePressureSoil, slice.DegreeOfConsolidationPorePressureSoil); + Assert.AreEqual(degreeOfConsolidationPorePressureLoad, slice.DegreeOfConsolidationPorePressureLoad); + Assert.AreEqual(dilatancy, slice.Dilatancy); + Assert.AreEqual(externalLoad, slice.ExternalLoad); + Assert.AreEqual(hydrostaticPorePressure, slice.HydrostaticPorePressure); + Assert.AreEqual(leftForce, slice.LeftForce); + Assert.AreEqual(leftForceAngle, slice.LeftForceAngle); + Assert.AreEqual(leftForceY, slice.LeftForceY); + Assert.AreEqual(rightForce, slice.RightForce); + Assert.AreEqual(rightForceAngle, slice.RightForceAngle); + Assert.AreEqual(rightForceY, slice.RightForceY); + Assert.AreEqual(loadStress, slice.LoadStress); + Assert.AreEqual(normalStress, slice.NormalStress); + Assert.AreEqual(porePressure, slice.PorePressure); + Assert.AreEqual(horizontalPorePressure, slice.HorizontalPorePressure); + Assert.AreEqual(verticalPorePressure, slice.VerticalPorePressure); + Assert.AreEqual(piezometricPorePressure, slice.PiezometricPorePressure); + Assert.AreEqual(effectiveStress, slice.EffectiveStress); + Assert.AreEqual(effectiveStressDaily, slice.EffectiveStressDaily); + Assert.AreEqual(excessPorePressure, slice.ExcessPorePressure); + Assert.AreEqual(shearStress, slice.ShearStress); + Assert.AreEqual(soilStress, slice.SoilStress); + Assert.AreEqual(totalPorePressure, slice.TotalPorePressure); + Assert.AreEqual(totalStress, slice.TotalStress); + Assert.AreEqual(weight, slice.Weight); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSlidingCircleResultTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSlidingCircleResultTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSlidingCircleResultTest.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,70 @@ +// 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 Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.KernelWrapper.Result; + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Result +{ + [TestFixture] + public class UpliftVanSlidingCircleResultTest + { + [Test] + public void Constructor_CenterNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => new UpliftVanSlidingCircleResult(null, 0.1, true, 0.2, 0.3, 0.4, 0.5); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("center", exception.ParamName); + } + + [Test] + public void Constructor_ExpectedValues() + { + // Setup + var random = new Random(11); + var center = new Point2D(random.NextDouble(), random.NextDouble()); + double radius = random.NextDouble(); + bool isActive = random.NextBoolean(); + double nonIteratedForce = random.NextDouble(); + double iteratedForce = random.NextDouble(); + double drivingMoment = random.NextDouble(); + double resistingMoment = random.NextDouble(); + + // Call + var circle = new UpliftVanSlidingCircleResult(center, radius, isActive, nonIteratedForce, iteratedForce, drivingMoment, resistingMoment); + + // Assert + Assert.AreEqual(center, circle.Center); + Assert.AreEqual(radius, circle.Radius); + Assert.AreEqual(isActive, circle.IsActive); + Assert.AreEqual(nonIteratedForce, circle.NonIteratedForce); + Assert.AreEqual(iteratedForce, circle.IteratedForce); + Assert.AreEqual(drivingMoment, circle.DrivingMoment); + Assert.AreEqual(resistingMoment, circle.ResistingMoment); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSlidingCurveResultTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSlidingCurveResultTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Result/UpliftVanSlidingCurveResultTest.cs (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -0,0 +1,103 @@ +// 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.Linq; +using Core.Common.Base.Geometry; +using NUnit.Framework; +using Ringtoets.MacroStabilityInwards.KernelWrapper.Result; +using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Result; + +namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Result +{ + [TestFixture] + public class UpliftVanSlidingCurveResultTest + { + [Test] + public void Constructor_LeftCircleNull_ThrowsArgumentNullException() + { + // Setup + UpliftVanSlidingCircleResult rightCircle = MacroStabilityInwardsSlidingCircleResultTestFactory.Create(); + + // Call + TestDelegate call = () => new UpliftVanSlidingCurveResult(null, rightCircle, Enumerable.Empty(), 0, 0); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("leftCircle", exception.ParamName); + } + + [Test] + public void Constructor_RightCircleNull_ThrowsArgumentNullException() + { + // Setup + UpliftVanSlidingCircleResult leftCircle = MacroStabilityInwardsSlidingCircleResultTestFactory.Create(); + + // Call + TestDelegate call = () => new UpliftVanSlidingCurveResult(leftCircle, null, Enumerable.Empty(), 0, 0); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("rightCircle", exception.ParamName); + } + + [Test] + public void Constructor_SlicesNull_ThrowsArgumentNullException() + { + // Setup + UpliftVanSlidingCircleResult circle = MacroStabilityInwardsSlidingCircleResultTestFactory.Create(); + + // Call + TestDelegate call = () => new UpliftVanSlidingCurveResult(circle, circle, null, 0, 0); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("slices", exception.ParamName); + } + + [Test] + public void Constructor_ExpectedValues() + { + // Setup + var random = new Random(21); + UpliftVanSlidingCircleResult rightCircle = MacroStabilityInwardsSlidingCircleResultTestFactory.Create(); + UpliftVanSlidingCircleResult leftCircle = MacroStabilityInwardsSlidingCircleResultTestFactory.Create(); + var slices = new[] + { + new UpliftVanSliceResult(new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), new Point2D(0, 0), + new UpliftVanSliceResult.ConstructionProperties()) + }; + + double nonIteratedHorizontalForce = random.NextDouble(); + double iteratedHorizontalForce = random.NextDouble(); + + // Call + var curve = new UpliftVanSlidingCurveResult(leftCircle, rightCircle, slices, nonIteratedHorizontalForce, iteratedHorizontalForce); + + // Assert + Assert.AreSame(leftCircle, curve.LeftCircle); + Assert.AreSame(rightCircle, curve.RightCircle); + Assert.AreEqual(nonIteratedHorizontalForce, curve.NonIteratedHorizontalForce); + Assert.AreEqual(iteratedHorizontalForce, curve.IteratedHorizontalForce); + CollectionAssert.AreEqual(slices, curve.Slices); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj =================================================================== diff -u -r832f344292007108d1e7323891eacce5bd678c0e -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj) (revision 832f344292007108d1e7323891eacce5bd678c0e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.Test.csproj) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -69,13 +69,13 @@ - - - + + + - + - + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorResultTest.cs =================================================================== diff -u -r832f344292007108d1e7323891eacce5bd678c0e -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorResultTest.cs (.../UpliftVanCalculatorResultTest.cs) (revision 832f344292007108d1e7323891eacce5bd678c0e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/UpliftVanCalculatorResultTest.cs (.../UpliftVanCalculatorResultTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -34,7 +34,7 @@ public void Constructor_SlidingCurveResultNull_ThrowsArgumentNullException() { // Setup - var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), + var calculationGridResult = new UpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), MacroStabilityInwardsGridResultTestFactory.Create(), new double[0]); @@ -50,7 +50,7 @@ public void Constructor_CalculationGridResultNull_ThrowsArgumentNullException() { // Setup - MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); + UpliftVanSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); // Call TestDelegate call = () => new UpliftVanCalculatorResult(slidingCurveResult, null, new UpliftVanCalculatorResult.ConstructionProperties()); @@ -65,8 +65,8 @@ public void Constructor_ConstructionPropertiesNull_ThrowsArgumentNullException() { // Setup - MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); - var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), + UpliftVanSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); + var calculationGridResult = new UpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), MacroStabilityInwardsGridResultTestFactory.Create(), new double[0]); @@ -82,8 +82,8 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); - var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), + UpliftVanSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); + var calculationGridResult = new UpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), MacroStabilityInwardsGridResultTestFactory.Create(), new double[0]); @@ -99,8 +99,8 @@ public void Constructor_EmptyConstructionProperties_ExpectedValues() { // Setup - MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); - var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), + UpliftVanSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); + var calculationGridResult = new UpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), MacroStabilityInwardsGridResultTestFactory.Create(), new double[0]); @@ -138,8 +138,8 @@ GridAutomaticallyCalculated = gridAutomaticallyCalculated }; - MacroStabilityInwardsSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); - var calculationGridResult = new MacroStabilityInwardsUpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), + UpliftVanSlidingCurveResult slidingCurveResult = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); + var calculationGridResult = new UpliftVanCalculationGridResult(MacroStabilityInwardsGridResultTestFactory.Create(), MacroStabilityInwardsGridResultTestFactory.Create(), new double[0]); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorResultTestFactoryTest.cs =================================================================== diff -u -r832f344292007108d1e7323891eacce5bd678c0e -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorResultTestFactoryTest.cs (.../MacroStabilityInwardsCalculatorResultTestFactoryTest.cs) (revision 832f344292007108d1e7323891eacce5bd678c0e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorResultTestFactoryTest.cs (.../MacroStabilityInwardsCalculatorResultTestFactoryTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -46,7 +46,7 @@ AssertUpliftVanCalculationGrid(result.CalculationGridResult); } - private static void AssertSlidingCurve(MacroStabilityInwardsSlidingCurveResult slidingCurve) + private static void AssertSlidingCurve(UpliftVanSlidingCurveResult slidingCurve) { AssertCircle(slidingCurve.LeftCircle); AssertCircle(slidingCurve.RightCircle); @@ -56,7 +56,7 @@ CollectionAssert.IsEmpty(slidingCurve.Slices); } - private static void AssertCircle(MacroStabilityInwardsSlidingCircleResult circle) + private static void AssertCircle(UpliftVanSlidingCircleResult circle) { Assert.AreEqual(new Point2D(0, 0), circle.Center); Assert.AreEqual(0.1, circle.Radius); @@ -67,7 +67,7 @@ Assert.AreEqual(0.5, circle.ResistingMoment); } - private static void AssertUpliftVanCalculationGrid(MacroStabilityInwardsUpliftVanCalculationGridResult upliftVanCalculationGrid) + private static void AssertUpliftVanCalculationGrid(UpliftVanCalculationGridResult upliftVanCalculationGrid) { AssertGrid(upliftVanCalculationGrid.LeftGrid); AssertGrid(upliftVanCalculationGrid.RightGrid); @@ -80,7 +80,7 @@ }, upliftVanCalculationGrid.TangentLines); } - private static void AssertGrid(MacroStabilityInwardsGridResult grid) + private static void AssertGrid(UpliftVanGridResult grid) { Assert.AreEqual(0.1, grid.XLeft); Assert.AreEqual(0.2, grid.XRight); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsGridResultTestFactoryTest.cs =================================================================== diff -u -rec61461326a925d109c7a58600a8fe3ee4c2b31c -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsGridResultTestFactoryTest.cs (.../MacroStabilityInwardsGridResultTestFactoryTest.cs) (revision ec61461326a925d109c7a58600a8fe3ee4c2b31c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsGridResultTestFactoryTest.cs (.../MacroStabilityInwardsGridResultTestFactoryTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -32,7 +32,7 @@ public void Create_Always_ReturnGridWithDefaultValues() { // Call - MacroStabilityInwardsGridResult grid = MacroStabilityInwardsGridResultTestFactory.Create(); + UpliftVanGridResult grid = MacroStabilityInwardsGridResultTestFactory.Create(); // Assert Assert.AreEqual(0.1, grid.XLeft); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsSlidingCircleResultTestFactoryTest.cs =================================================================== diff -u -r2c8c5eec330543aab5ece02da4159ce53cfde11b -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsSlidingCircleResultTestFactoryTest.cs (.../MacroStabilityInwardsSlidingCircleResultTestFactoryTest.cs) (revision 2c8c5eec330543aab5ece02da4159ce53cfde11b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsSlidingCircleResultTestFactoryTest.cs (.../MacroStabilityInwardsSlidingCircleResultTestFactoryTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -33,7 +33,7 @@ public void Create_Always_ReturnCircleWithDefaultValues() { // Call - MacroStabilityInwardsSlidingCircleResult circle = MacroStabilityInwardsSlidingCircleResultTestFactory.Create(); + UpliftVanSlidingCircleResult circle = MacroStabilityInwardsSlidingCircleResultTestFactory.Create(); // Assert Assert.AreEqual(new Point2D(0, 0), circle.Center); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsSlidingCurveResultTestFactoryTest.cs =================================================================== diff -u -re95718a891fa178feab8e70bee2db77e9dedc790 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsSlidingCurveResultTestFactoryTest.cs (.../MacroStabilityInwardsSlidingCurveResultTestFactoryTest.cs) (revision e95718a891fa178feab8e70bee2db77e9dedc790) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Result/MacroStabilityInwardsSlidingCurveResultTestFactoryTest.cs (.../MacroStabilityInwardsSlidingCurveResultTestFactoryTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -33,7 +33,7 @@ public void Create_Always_ReturnSlidingCurveResult() { // Call - MacroStabilityInwardsSlidingCurveResult curve = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); + UpliftVanSlidingCurveResult curve = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); // Assert AssertCircle(curve.LeftCircle); @@ -44,7 +44,7 @@ CollectionAssert.IsEmpty(curve.Slices); } - private static void AssertCircle(MacroStabilityInwardsSlidingCircleResult circle) + private static void AssertCircle(UpliftVanSlidingCircleResult circle) { Assert.AreEqual(new Point2D(0, 0), circle.Center); Assert.AreEqual(0.1, circle.Radius); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorResultTestFactory.cs =================================================================== diff -u -r832f344292007108d1e7323891eacce5bd678c0e -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorResultTestFactory.cs (.../MacroStabilityInwardsCalculatorResultTestFactory.cs) (revision 832f344292007108d1e7323891eacce5bd678c0e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorResultTestFactory.cs (.../MacroStabilityInwardsCalculatorResultTestFactory.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -38,7 +38,7 @@ { return new UpliftVanCalculatorResult( MacroStabilityInwardsSlidingCurveResultTestFactory.Create(), - new MacroStabilityInwardsUpliftVanCalculationGridResult( + new UpliftVanCalculationGridResult( MacroStabilityInwardsGridResultTestFactory.Create(), MacroStabilityInwardsGridResultTestFactory.Create(), new[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsCalculatorResultHelper.cs =================================================================== diff -u -r8df85402c4de8eb335483bcda5e4ff23ce0dd5ef -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsCalculatorResultHelper.cs (.../MacroStabilityInwardsCalculatorResultHelper.cs) (revision 8df85402c4de8eb335483bcda5e4ff23ce0dd5ef) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsCalculatorResultHelper.cs (.../MacroStabilityInwardsCalculatorResultHelper.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -37,7 +37,7 @@ /// The actual values. /// Thrown when the /// is not equal to the . - public static void AssertSlidingCurve(MacroStabilityInwardsSlidingCurveResult expected, MacroStabilityInwardsSlidingCurveResult actual) + public static void AssertSlidingCurve(UpliftVanSlidingCurveResult expected, UpliftVanSlidingCurveResult actual) { Assert.AreEqual(expected.IteratedHorizontalForce, actual.IteratedHorizontalForce); Assert.AreEqual(expected.NonIteratedHorizontalForce, actual.NonIteratedHorizontalForce); @@ -47,14 +47,14 @@ AssertSlices(expected.Slices.ToArray(), actual.Slices.ToArray()); } - public static void AssertSlipPlaneGrid(MacroStabilityInwardsUpliftVanCalculationGridResult expected, MacroStabilityInwardsUpliftVanCalculationGridResult actual) + public static void AssertSlipPlaneGrid(UpliftVanCalculationGridResult expected, UpliftVanCalculationGridResult actual) { CollectionAssert.AreEqual(expected.TangentLines, actual.TangentLines); AssertGrid(expected.LeftGrid, actual.LeftGrid); AssertGrid(expected.RightGrid, actual.RightGrid); } - private static void AssertGrid(MacroStabilityInwardsGridResult expected, MacroStabilityInwardsGridResult actual) + private static void AssertGrid(UpliftVanGridResult expected, UpliftVanGridResult actual) { Assert.AreEqual(expected.XLeft, actual.XLeft); Assert.AreEqual(expected.XRight, actual.XRight); @@ -64,7 +64,7 @@ Assert.AreEqual(expected.NumberOfVerticalPoints, actual.NumberOfVerticalPoints); } - private static void AssertCircle(MacroStabilityInwardsSlidingCircleResult expected, MacroStabilityInwardsSlidingCircleResult actual) + private static void AssertCircle(UpliftVanSlidingCircleResult expected, UpliftVanSlidingCircleResult actual) { Assert.AreEqual(expected.Center, actual.Center); Assert.AreEqual(expected.Radius, actual.Radius); @@ -75,7 +75,7 @@ Assert.AreEqual(expected.ResistingMoment, actual.ResistingMoment); } - private static void AssertSlices(MacroStabilityInwardsSliceResult[] expectedSlices, MacroStabilityInwardsSliceResult[] actualSlices) + private static void AssertSlices(UpliftVanSliceResult[] expectedSlices, UpliftVanSliceResult[] actualSlices) { Assert.AreEqual(expectedSlices.Length, actualSlices.Length); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsGridResultTestFactory.cs =================================================================== diff -u -rec61461326a925d109c7a58600a8fe3ee4c2b31c -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsGridResultTestFactory.cs (.../MacroStabilityInwardsGridResultTestFactory.cs) (revision ec61461326a925d109c7a58600a8fe3ee4c2b31c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsGridResultTestFactory.cs (.../MacroStabilityInwardsGridResultTestFactory.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -24,18 +24,18 @@ namespace Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Result { /// - /// Factory to create simple + /// Factory to create simple /// instances that can be used for testing. /// public static class MacroStabilityInwardsGridResultTestFactory { /// - /// Creates a new . + /// Creates a new . /// - /// The created . - public static MacroStabilityInwardsGridResult Create() + /// The created . + public static UpliftVanGridResult Create() { - return new MacroStabilityInwardsGridResult(0.1, 0.2, 0.3, 0.4, 1, 2); + return new UpliftVanGridResult(0.1, 0.2, 0.3, 0.4, 1, 2); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsSlidingCircleResultTestFactory.cs =================================================================== diff -u -r2c8c5eec330543aab5ece02da4159ce53cfde11b -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsSlidingCircleResultTestFactory.cs (.../MacroStabilityInwardsSlidingCircleResultTestFactory.cs) (revision 2c8c5eec330543aab5ece02da4159ce53cfde11b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsSlidingCircleResultTestFactory.cs (.../MacroStabilityInwardsSlidingCircleResultTestFactory.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -25,18 +25,18 @@ namespace Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Result { /// - /// Factory to create simple + /// Factory to create simple /// instances that can be used for testing. /// public static class MacroStabilityInwardsSlidingCircleResultTestFactory { /// - /// Creates a new . + /// Creates a new . /// - /// The created . - public static MacroStabilityInwardsSlidingCircleResult Create() + /// The created . + public static UpliftVanSlidingCircleResult Create() { - return new MacroStabilityInwardsSlidingCircleResult(new Point2D(0, 0), 0.1, true, 0.2, 0.3, 0.4, 0.5); + return new UpliftVanSlidingCircleResult(new Point2D(0, 0), 0.1, true, 0.2, 0.3, 0.4, 0.5); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsSlidingCurveResultTestFactory.cs =================================================================== diff -u -r2c8c5eec330543aab5ece02da4159ce53cfde11b -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsSlidingCurveResultTestFactory.cs (.../MacroStabilityInwardsSlidingCurveResultTestFactory.cs) (revision 2c8c5eec330543aab5ece02da4159ce53cfde11b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Result/MacroStabilityInwardsSlidingCurveResultTestFactory.cs (.../MacroStabilityInwardsSlidingCurveResultTestFactory.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -25,21 +25,21 @@ namespace Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Result { /// - /// Factory to create simple + /// Factory to create simple /// instances that can be used for testing. /// public static class MacroStabilityInwardsSlidingCurveResultTestFactory { /// - /// Creates a new . + /// Creates a new . /// - /// The created . - public static MacroStabilityInwardsSlidingCurveResult Create() + /// The created . + public static UpliftVanSlidingCurveResult Create() { - return new MacroStabilityInwardsSlidingCurveResult( + return new UpliftVanSlidingCurveResult( MacroStabilityInwardsSlidingCircleResultTestFactory.Create(), MacroStabilityInwardsSlidingCircleResultTestFactory.Create(), - Enumerable.Empty(), 0, 0); + Enumerable.Empty(), 0, 0); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlidingCurveConverterTest.cs =================================================================== diff -u -r9786acfc77036e9dde212b1c36cbc5457e1ff663 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlidingCurveConverterTest.cs (.../MacroStabilityInwardsSlidingCurveConverterTest.cs) (revision 9786acfc77036e9dde212b1c36cbc5457e1ff663) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlidingCurveConverterTest.cs (.../MacroStabilityInwardsSlidingCurveConverterTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -48,7 +48,7 @@ public void Convert_WithResult_ReturnConvertedSlidingCurve() { // Setup - MacroStabilityInwardsSlidingCurveResult result = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); + UpliftVanSlidingCurveResult result = MacroStabilityInwardsSlidingCurveResultTestFactory.Create(); // Call MacroStabilityInwardsSlidingCurve output = MacroStabilityInwardsSlidingCurveConverter.Convert(result); @@ -61,7 +61,7 @@ AssertSlices(result.Slices, output.Slices); } - private static void AssertCircle(MacroStabilityInwardsSlidingCircleResult circleResult, MacroStabilityInwardsSlidingCircle circleOutput) + private static void AssertCircle(UpliftVanSlidingCircleResult circleResult, MacroStabilityInwardsSlidingCircle circleOutput) { Assert.AreEqual(circleResult.Center, circleOutput.Center); Assert.AreEqual(circleResult.IsActive, circleOutput.IsActive); @@ -72,9 +72,9 @@ Assert.AreEqual(circleResult.NonIteratedForce, circleOutput.NonIteratedForce); } - private static void AssertSlices(IEnumerable resultSlices, IEnumerable outputSlices) + private static void AssertSlices(IEnumerable resultSlices, IEnumerable outputSlices) { - MacroStabilityInwardsSliceResult[] expectedSlices = resultSlices.ToArray(); + UpliftVanSliceResult[] expectedSlices = resultSlices.ToArray(); MacroStabilityInwardsSlice[] actualSlices = outputSlices.ToArray(); Assert.AreEqual(expectedSlices.Length, actualSlices.Length); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs =================================================================== diff -u -r1b16d1bbb40c8246bd53a1dcfa7803cb92501915 -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs) (revision 1b16d1bbb40c8246bd53a1dcfa7803cb92501915) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs (.../MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -47,16 +47,16 @@ public void Convert_WithResult_ReturnConvertedSlipPlaneUpliftVan() { // Setup - MacroStabilityInwardsGridResult leftGrid = MacroStabilityInwardsGridResultTestFactory.Create(); - MacroStabilityInwardsGridResult rightGrid = MacroStabilityInwardsGridResultTestFactory.Create(); + UpliftVanGridResult leftGrid = MacroStabilityInwardsGridResultTestFactory.Create(); + UpliftVanGridResult rightGrid = MacroStabilityInwardsGridResultTestFactory.Create(); var tangentLines = new[] { 3, 2, 1.5 }; - var result = new MacroStabilityInwardsUpliftVanCalculationGridResult(leftGrid, rightGrid, tangentLines); + var result = new UpliftVanCalculationGridResult(leftGrid, rightGrid, tangentLines); // Call MacroStabilityInwardsSlipPlaneUpliftVan output = MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(result); @@ -67,7 +67,7 @@ AssertGrid(rightGrid, output.RightGrid); } - private static void AssertGrid(MacroStabilityInwardsGridResult expectedGrid, MacroStabilityInwardsGrid actualGrid) + private static void AssertGrid(UpliftVanGridResult expectedGrid, MacroStabilityInwardsGrid actualGrid) { Assert.AreEqual(expectedGrid.XLeft, actualGrid.XLeft); Assert.AreEqual(expectedGrid.XRight, actualGrid.XRight); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r832f344292007108d1e7323891eacce5bd678c0e -r283274d59060df06800cc23bd00ea9a31535d174 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 832f344292007108d1e7323891eacce5bd678c0e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 283274d59060df06800cc23bd00ea9a31535d174) @@ -396,7 +396,7 @@ AssertSlipPlane(expectedOutput.CalculationGridResult, actualOutput.SlipPlane); } - private static void AssertSlidingCurve(MacroStabilityInwardsSlidingCurveResult expected, MacroStabilityInwardsSlidingCurve actual) + private static void AssertSlidingCurve(UpliftVanSlidingCurveResult expected, MacroStabilityInwardsSlidingCurve actual) { Assert.AreEqual(expected.IteratedHorizontalForce, actual.IteratedHorizontalForce); Assert.AreEqual(expected.NonIteratedHorizontalForce, actual.NonIteratedHorizontalForce); @@ -405,7 +405,7 @@ AssertSlices(expected.Slices, actual.Slices); } - private static void AssertCircle(MacroStabilityInwardsSlidingCircleResult circleResult, MacroStabilityInwardsSlidingCircle circleOutput) + private static void AssertCircle(UpliftVanSlidingCircleResult circleResult, MacroStabilityInwardsSlidingCircle circleOutput) { Assert.AreEqual(circleResult.Center, circleOutput.Center); Assert.AreEqual(circleResult.IsActive, circleOutput.IsActive); @@ -416,9 +416,9 @@ Assert.AreEqual(circleResult.NonIteratedForce, circleOutput.NonIteratedForce); } - private static void AssertSlices(IEnumerable resultSlices, IEnumerable outputSlices) + private static void AssertSlices(IEnumerable resultSlices, IEnumerable outputSlices) { - MacroStabilityInwardsSliceResult[] expectedSlices = resultSlices.ToArray(); + UpliftVanSliceResult[] expectedSlices = resultSlices.ToArray(); MacroStabilityInwardsSlice[] actualSlices = outputSlices.ToArray(); Assert.AreEqual(expectedSlices.Length, actualSlices.Length); @@ -458,14 +458,14 @@ } } - private static void AssertSlipPlane(MacroStabilityInwardsUpliftVanCalculationGridResult expected, MacroStabilityInwardsSlipPlaneUpliftVan actual) + private static void AssertSlipPlane(UpliftVanCalculationGridResult expected, MacroStabilityInwardsSlipPlaneUpliftVan actual) { CollectionAssert.AreEqual(expected.TangentLines, actual.TangentLines); AssertGrid(expected.LeftGrid, actual.LeftGrid); AssertGrid(expected.RightGrid, actual.RightGrid); } - private static void AssertGrid(MacroStabilityInwardsGridResult expectedGrid, MacroStabilityInwardsGrid actualGrid) + private static void AssertGrid(UpliftVanGridResult expectedGrid, MacroStabilityInwardsGrid actualGrid) { Assert.AreEqual(expectedGrid.XLeft, actualGrid.XLeft); Assert.AreEqual(expectedGrid.XRight, actualGrid.XRight);