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,