Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.CalculatedInput/WaternetCalculationService.cs (.../WaternetCalculationService.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -136,7 +136,6 @@ { WaternetCreationMode = WaternetCreationMode.CreateWaternet, PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017, - LandwardDirection = LandwardDirection.PositiveX, SurfaceLine = input.SurfaceLine, SoilProfile = SoilProfileConverter.Convert(input.SoilProfileUnderSurfaceLine), DrainageConstruction = DrainageConstructionConverter.Convert(input), Fisheye: Tag 71148524edf9415e4c488bcb41755cd1b3b49fd8 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Input/LandwardDirection.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -86,7 +86,6 @@ WaternetCreationMode = properties.WaternetCreationMode; PlLineCreationMethod = properties.PlLineCreationMethod; AssessmentLevel = properties.AssessmentLevel; - LandwardDirection = properties.LandwardDirection; SurfaceLine = properties.SurfaceLine; SoilProfile = properties.SoilProfile; DrainageConstruction = properties.DrainageConstruction; @@ -126,7 +125,6 @@ WaternetCreationMode = WaternetCreationMode.CreateWaternet; PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017; AssessmentLevel = double.NaN; - LandwardDirection = LandwardDirection.PositiveX; WaterLevelRiverAverage = double.NaN; WaterLevelPolderExtreme = double.NaN; WaterLevelPolderDaily = double.NaN; @@ -163,11 +161,6 @@ public double AssessmentLevel { internal get; set; } /// - /// Gets or sets the landward direction of . - /// - public LandwardDirection LandwardDirection { internal get; set; } - - /// /// Gets or sets the surface line. /// public MacroStabilityInwardsSurfaceLine SurfaceLine { internal get; set; } @@ -323,11 +316,6 @@ public double AssessmentLevel { get; } /// - /// Gets the landward direction of . - /// - public LandwardDirection LandwardDirection { get; } - - /// /// Gets the surface line. /// public MacroStabilityInwardsSurfaceLine SurfaceLine { get; } Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs =================================================================== diff -u -rc40864eb1a9d292ad2b9058fb28e63811be38498 -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision c40864eb1a9d292ad2b9058fb28e63811be38498) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -120,7 +120,7 @@ upliftVanKernel.SetSoilProfile(SoilProfileCreator.Create(input.SoilProfile.PreconsolidationStresses, layersWithSoil)); upliftVanKernel.SetLocationExtreme(UpliftVanStabilityLocationCreator.CreateExtreme(input)); upliftVanKernel.SetLocationDaily(UpliftVanStabilityLocationCreator.CreateDaily(input)); - upliftVanKernel.SetSurfaceLine(SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection)); + upliftVanKernel.SetSurfaceLine(SurfaceLineCreator.Create(input.SurfaceLine)); upliftVanKernel.SetSlipPlaneUpliftVan(SlipPlaneUpliftVanCreator.Create(input.SlipPlane)); upliftVanKernel.SetSlipPlaneConstraints(SlipPlaneConstraintsCreator.Create(input.SlipPlaneConstraints)); upliftVanKernel.SetGridAutomaticDetermined(input.SlipPlane.GridAutomaticDetermined); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/Input/WaternetCalculatorInput.cs (.../WaternetCalculatorInput.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -74,7 +74,6 @@ WaternetCreationMode = properties.WaternetCreationMode; PlLineCreationMethod = properties.PlLineCreationMethod; AssessmentLevel = properties.AssessmentLevel; - LandwardDirection = properties.LandwardDirection; SurfaceLine = properties.SurfaceLine; SoilProfile = properties.SoilProfile; DrainageConstruction = properties.DrainageConstruction; @@ -107,7 +106,6 @@ WaternetCreationMode = WaternetCreationMode.CreateWaternet; PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017; AssessmentLevel = double.NaN; - LandwardDirection = LandwardDirection.PositiveX; WaterLevelRiverAverage = double.NaN; WaterLevelPolder = double.NaN; MinimumLevelPhreaticLineAtDikeTopRiver = double.NaN; @@ -141,11 +139,6 @@ public double AssessmentLevel { internal get; set; } /// - /// Gets or sets the landward direction of . - /// - public LandwardDirection LandwardDirection { internal get; set; } - - /// /// Gets or sets the surface line. /// public MacroStabilityInwardsSurfaceLine SurfaceLine { internal get; set; } @@ -263,11 +256,6 @@ public double AssessmentLevel { get; } /// - /// Gets the landward direction of . - /// - public LandwardDirection LandwardDirection { get; } - - /// /// Gets the surface line. /// public MacroStabilityInwardsSurfaceLine SurfaceLine { get; } Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs =================================================================== diff -u -r87b2859379de95fc1a835e27c2575009f196cd88 -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs (.../WaternetCalculator.cs) (revision 87b2859379de95fc1a835e27c2575009f196cd88) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs (.../WaternetCalculator.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -109,7 +109,7 @@ waternetKernel.SetLocation(WaternetStabilityLocationCreator.Create(Input)); waternetKernel.SetSoilModel(SoilModelCreator.Create(layersWithSoil.Select(lws => lws.Soil).ToArray())); waternetKernel.SetSoilProfile(SoilProfileCreator.Create(Input.SoilProfile.PreconsolidationStresses, layersWithSoil)); - waternetKernel.SetSurfaceLine(SurfaceLineCreator.Create(Input.SurfaceLine, Input.LandwardDirection)); + waternetKernel.SetSurfaceLine(SurfaceLineCreator.Create(Input.SurfaceLine)); } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs =================================================================== diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs (.../SurfaceLineCreator.cs) (revision d11571aac4a3ec206f9a4279369d446859e9edbf) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/SurfaceLineCreator.cs (.../SurfaceLineCreator.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -26,8 +26,6 @@ using Core.Common.Base.Geometry; using Deltares.MacroStability.Geometry; using Riskeer.MacroStabilityInwards.Primitives; -using LandwardDirection = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection; -using WtiStabilityLandwardDirection = Deltares.MacroStability.Geometry.LandwardDirection; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input { @@ -42,14 +40,9 @@ /// /// The from /// which to take the information. - /// The landward direction of the surface line. /// A new with information taken from the . /// Thrown when is null. - /// Thrown when - /// is an invalid value. - /// Thrown when - /// is a valid value, but unsupported. - public static SurfaceLine2 Create(MacroStabilityInwardsSurfaceLine surfaceLine, LandwardDirection landwardDirection) + public static SurfaceLine2 Create(MacroStabilityInwardsSurfaceLine surfaceLine) { if (surfaceLine == null) { @@ -58,8 +51,7 @@ var wtiSurfaceLine = new SurfaceLine2 { - Name = surfaceLine.Name, - LandwardDirection = ConvertLandwardDirection(landwardDirection) + Name = surfaceLine.Name }; if (surfaceLine.Points.Any()) @@ -79,35 +71,6 @@ return wtiSurfaceLine; } - /// - /// Converts a into a . - /// - /// The to convert. - /// A based on . - /// Thrown when - /// is an invalid value. - /// Thrown when - /// is a valid value, but unsupported. - private static WtiStabilityLandwardDirection ConvertLandwardDirection(LandwardDirection landwardDirection) - { - if (!Enum.IsDefined(typeof(LandwardDirection), landwardDirection)) - { - throw new InvalidEnumArgumentException(nameof(landwardDirection), - (int) landwardDirection, - typeof(LandwardDirection)); - } - - switch (landwardDirection) - { - case LandwardDirection.PositiveX: - return WtiStabilityLandwardDirection.PositiveX; - case LandwardDirection.NegativeX: - return WtiStabilityLandwardDirection.NegativeX; - default: - throw new NotSupportedException(); - } - } - private static IEnumerable CreateCharacteristicPoints(MacroStabilityInwardsSurfaceLine surfaceLine, GeometryPoint[] geometryPoints) { var characteristicPoints = new List(); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r77f595651b934a75a5625828a9027d7c48e8e5f9 -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 77f595651b934a75a5625828a9027d7c48e8e5f9) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -179,7 +179,6 @@ WaternetCreationMode = WaternetCreationMode.CreateWaternet, PlLineCreationMethod = PlLineCreationMethod.RingtoetsWti2017, AssessmentLevel = effectiveAssessmentLevel, - LandwardDirection = LandwardDirection.PositiveX, SurfaceLine = inputParameters.SurfaceLine, SoilProfile = SoilProfileConverter.Convert(inputParameters.SoilProfileUnderSurfaceLine), DrainageConstruction = DrainageConstructionConverter.Convert(inputParameters), Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs (.../WaternetCalculationServiceTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs (.../WaternetCalculationServiceTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -193,7 +193,6 @@ CalculatorInputAssert.AssertDrainageConstruction(originalInput, actualInput.DrainageConstruction); Assert.AreEqual(WaternetCreationMode.CreateWaternet, actualInput.WaternetCreationMode); Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, actualInput.PlLineCreationMethod); - Assert.AreEqual(LandwardDirection.PositiveX, actualInput.LandwardDirection); Assert.AreSame(originalInput.SurfaceLine, actualInput.SurfaceLine); Assert.AreEqual(originalInput.DikeSoilScenario, actualInput.DikeSoilScenario); Assert.AreEqual(originalInput.WaterLevelRiverAverage, actualInput.WaterLevelRiverAverage); Fisheye: Tag 71148524edf9415e4c488bcb41755cd1b3b49fd8 refers to a dead (removed) revision in file `Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Input/LandwardDirectionTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs (.../UpliftVanCalculatorInputTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs (.../UpliftVanCalculatorInputTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -58,7 +58,6 @@ var slipPlaneConstraints = new UpliftVanSlipPlaneConstraints(random.NextDouble(), random.NextDouble(), random.NextBoolean()); var waternetCreationMode = random.NextEnumValue(); var plLineCreationMethod = random.NextEnumValue(); - var landwardDirection = random.NextEnumValue(); double waterLevelRiverAverage = random.NextDouble(); double waterLevelPolderExtreme = random.NextDouble(); double waterLevelPolderDaily = random.NextDouble(); @@ -84,7 +83,6 @@ WaternetCreationMode = waternetCreationMode, PlLineCreationMethod = plLineCreationMethod, AssessmentLevel = hRiverValue, - LandwardDirection = landwardDirection, SurfaceLine = surfaceLine, SoilProfile = soilProfile, DrainageConstruction = drainageConstruction, @@ -116,7 +114,6 @@ Assert.AreEqual(plLineCreationMethod, input.PlLineCreationMethod); Assert.AreEqual(hRiverValue, input.AssessmentLevel); Assert.AreSame(surfaceLine, input.SurfaceLine); - Assert.AreEqual(landwardDirection, input.LandwardDirection); Assert.AreSame(soilProfile, input.SoilProfile); Assert.AreSame(drainageConstruction, input.DrainageConstruction); Assert.AreSame(phreaticLineOffsets, input.PhreaticLineOffsetsDaily); @@ -190,7 +187,6 @@ Assert.AreEqual(WaternetCreationMode.CreateWaternet, input.WaternetCreationMode); Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); - Assert.AreEqual(LandwardDirection.PositiveX, input.LandwardDirection); Assert.AreEqual(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, input.DikeSoilScenario); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs =================================================================== diff -u -r7bf51f030527be41ccb8043bbe8aaea16e58ac9d -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs (.../UpliftVanCalculatorTest.cs) (revision 7bf51f030527be41ccb8043bbe8aaea16e58ac9d) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs (.../UpliftVanCalculatorTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -145,7 +145,7 @@ KernelInputAssert.AssertSoilProfiles(SoilProfileCreator.Create(input.SoilProfile.PreconsolidationStresses, layersWithSoil), upliftVanKernel.SoilProfile); KernelInputAssert.AssertStabilityLocations(UpliftVanStabilityLocationCreator.CreateExtreme(input), upliftVanKernel.LocationExtreme); KernelInputAssert.AssertStabilityLocations(UpliftVanStabilityLocationCreator.CreateDaily(input), upliftVanKernel.LocationDaily); - KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection), upliftVanKernel.SurfaceLine); + KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine), upliftVanKernel.SurfaceLine); UpliftVanKernelInputAssert.AssertSlipPlanesUpliftVan(SlipPlaneUpliftVanCreator.Create(input.SlipPlane), upliftVanKernel.SlipPlaneUpliftVan); UpliftVanKernelInputAssert.AssertSlipPlaneConstraints(SlipPlaneConstraintsCreator.Create(input.SlipPlaneConstraints), upliftVanKernel.SlipPlaneConstraints); Assert.AreEqual(input.SlipPlane.GridAutomaticDetermined, upliftVanKernel.GridAutomaticDetermined); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs (.../WaternetCalculatorInputTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/Input/WaternetCalculatorInputTest.cs (.../WaternetCalculatorInputTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -57,7 +57,6 @@ var waternetCreationMode = random.NextEnumValue(); var plLineCreationMethod = random.NextEnumValue(); - var landwardDirection = random.NextEnumValue(); double waterLevelRiverAverage = random.NextDouble(); double waterLevelPolder = random.NextDouble(); double minimumLevelPhreaticLineAtDikeTopRiver = random.NextDouble(); @@ -79,7 +78,6 @@ WaternetCreationMode = waternetCreationMode, PlLineCreationMethod = plLineCreationMethod, AssessmentLevel = assessmentLevel, - LandwardDirection = landwardDirection, SurfaceLine = surfaceLine, SoilProfile = soilProfile, DrainageConstruction = drainageConstruction, @@ -104,7 +102,6 @@ Assert.AreEqual(plLineCreationMethod, input.PlLineCreationMethod); Assert.AreEqual(assessmentLevel, input.AssessmentLevel); Assert.AreSame(surfaceLine, input.SurfaceLine); - Assert.AreEqual(landwardDirection, input.LandwardDirection); Assert.AreSame(soilProfile, input.SoilProfile); Assert.AreSame(drainageConstruction, input.DrainageConstruction); Assert.AreSame(phreaticLineOffsets, input.PhreaticLineOffsets); @@ -161,7 +158,6 @@ Assert.AreEqual(WaternetCreationMode.CreateWaternet, input.WaternetCreationMode); Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); - Assert.AreEqual(LandwardDirection.PositiveX, input.LandwardDirection); Assert.AreEqual(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, input.DikeSoilScenario); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetDailyCalculatorTest.cs =================================================================== diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetDailyCalculatorTest.cs (.../WaternetDailyCalculatorTest.cs) (revision d11571aac4a3ec206f9a4279369d446859e9edbf) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetDailyCalculatorTest.cs (.../WaternetDailyCalculatorTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -77,7 +77,7 @@ KernelInputAssert.AssertSoilModels(SoilModelCreator.Create(layersWithSoil.Select(lws => lws.Soil).ToArray()), waternetKernel.SoilModel); KernelInputAssert.AssertSoilProfiles(SoilProfileCreator.Create(input.SoilProfile.PreconsolidationStresses, layersWithSoil), waternetKernel.SoilProfile); KernelInputAssert.AssertStabilityLocations(WaternetStabilityLocationCreator.Create(input), waternetKernel.Location); - KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection), waternetKernel.SurfaceLine); + KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine), waternetKernel.SurfaceLine); } } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetExtremeCalculatorTest.cs =================================================================== diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetExtremeCalculatorTest.cs (.../WaternetExtremeCalculatorTest.cs) (revision d11571aac4a3ec206f9a4279369d446859e9edbf) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetExtremeCalculatorTest.cs (.../WaternetExtremeCalculatorTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -77,7 +77,7 @@ KernelInputAssert.AssertSoilModels(SoilModelCreator.Create(layersWithSoil.Select(lws => lws.Soil).ToArray()), waternetKernel.SoilModel); KernelInputAssert.AssertSoilProfiles(SoilProfileCreator.Create(input.SoilProfile.PreconsolidationStresses, layersWithSoil), waternetKernel.SoilProfile); KernelInputAssert.AssertStabilityLocations(WaternetStabilityLocationCreator.Create(input), waternetKernel.Location); - KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine, input.LandwardDirection), waternetKernel.SurfaceLine); + KernelInputAssert.AssertSurfaceLines(SurfaceLineCreator.Create(input.SurfaceLine), waternetKernel.SurfaceLine); } } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs =================================================================== diff -u -rd11571aac4a3ec206f9a4279369d446859e9edbf -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs (.../SurfaceLineCreatorTest.cs) (revision d11571aac4a3ec206f9a4279369d446859e9edbf) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SurfaceLineCreatorTest.cs (.../SurfaceLineCreatorTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -28,8 +28,6 @@ using NUnit.Framework; using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input; using Riskeer.MacroStabilityInwards.Primitives; -using LandwardDirection = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.LandwardDirection; -using WtiStabilityLandwardDirection = Deltares.MacroStability.Geometry.LandwardDirection; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input { @@ -40,7 +38,7 @@ public void Create_SurfaceLineNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => SurfaceLineCreator.Create(null, LandwardDirection.PositiveX); + TestDelegate call = () => SurfaceLineCreator.Create(null); // Assert var exception = Assert.Throws(call); @@ -55,7 +53,7 @@ var surfaceLine = new MacroStabilityInwardsSurfaceLine(name); // Call - SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, LandwardDirection.PositiveX); + SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine); // Assert AssertGeneralValues(name, actual); @@ -76,7 +74,7 @@ }); // Call - SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, LandwardDirection.PositiveX); + SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine); // Assert AssertGeneralValues(name, actual); @@ -100,7 +98,7 @@ }); // Call - SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, LandwardDirection.PositiveX); + SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine); // Assert AssertGeneralValues(name, actual); @@ -126,7 +124,7 @@ }); // Call - SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, LandwardDirection.PositiveX); + SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine); // Assert AssertGeneralValues(name, actual); @@ -157,7 +155,7 @@ }); // Call - SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, LandwardDirection.PositiveX); + SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine); // Assert AssertGeneralValues(name, actual); @@ -209,7 +207,7 @@ surfaceLine.SetDikeTopAtRiverAt(geometry[11]); // Call - SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, LandwardDirection.PositiveX); + SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine); // Assert AssertGeneralValues(name, actual); @@ -239,38 +237,6 @@ Assert.IsTrue(actualCharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver).LocationEquals(ToGeometryPoint(geometry[11]))); } - [Test] - public void Create_InvalidLandwardDirection_ThrowInvalidEnumArgumentException() - { - // Setup - const string name = "Surface line with landward direction"; - var surfaceLine = new MacroStabilityInwardsSurfaceLine(name); - - // Call - TestDelegate test = () => SurfaceLineCreator.Create(surfaceLine, (LandwardDirection) 99); - - // Assert - string message = $"The value of argument 'landwardDirection' ({99}) is invalid for Enum type '{typeof(LandwardDirection).Name}'."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); - } - - [TestCase(LandwardDirection.PositiveX, WtiStabilityLandwardDirection.PositiveX)] - [TestCase(LandwardDirection.NegativeX, WtiStabilityLandwardDirection.NegativeX)] - public void Create_ValidLandwardDirection_CreateSurfaceLineWithLandwardDirection(LandwardDirection landwardDirection, - WtiStabilityLandwardDirection expectedLandwardDirection) - { - // Setup - const string name = "Surface line with landward direction"; - var surfaceLine = new MacroStabilityInwardsSurfaceLine(name); - - // Call - SurfaceLine2 actual = SurfaceLineCreator.Create(surfaceLine, landwardDirection); - - // Assert - AssertGeneralValues(name, actual); - Assert.AreEqual(expectedLandwardDirection, actual.LandwardDirection); - } - private static void AssertGeneralValues(string name, SurfaceLine2 actual) { Assert.AreEqual(name, actual.Name); // Unused property Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -60,7 +60,6 @@ Assert.AreEqual(WaternetCreationMode.CreateWaternet, input.WaternetCreationMode); Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); - Assert.AreEqual(LandwardDirection.PositiveX, input.LandwardDirection); Assert.IsTrue(Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), input.DikeSoilScenario)); } @@ -91,7 +90,6 @@ Assert.AreEqual(WaternetCreationMode.CreateWaternet, input.WaternetCreationMode); Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); - Assert.AreEqual(LandwardDirection.PositiveX, input.LandwardDirection); Assert.IsTrue(Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), input.DikeSoilScenario)); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs =================================================================== diff -u -rc768b280255959d107b292acb654b67ece32eb1f -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs (.../KernelInputAssert.cs) (revision c768b280255959d107b292acb654b67ece32eb1f) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs (.../KernelInputAssert.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -73,7 +73,6 @@ /// is not equal to . public static void AssertStabilityLocations(Location expected, Location actual) { - Assert.AreEqual(expected.StabilityModel, actual.StabilityModel); Assert.AreEqual(expected.DikeSoilScenario, actual.DikeSoilScenario); Assert.AreEqual(expected.WaternetCreationMode, actual.WaternetCreationMode); Assert.AreEqual(expected.PlLineCreationMethod, actual.PlLineCreationMethod); @@ -115,7 +114,6 @@ public static void AssertSurfaceLines(SurfaceLine2 expected, SurfaceLine2 actual) { Assert.AreEqual(expected.Name, actual.Name); - Assert.AreEqual(expected.LandwardDirection, actual.LandwardDirection); AssertGeometryPointStrings(expected.Geometry, actual.Geometry); AssertCharacteristicPointSets(expected.CharacteristicPoints, actual.CharacteristicPoints); } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -rd692babe7fb771c8c016700f7c9b09a1ccf780c3 -r71148524edf9415e4c488bcb41755cd1b3b49fd8 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision d692babe7fb771c8c016700f7c9b09a1ccf780c3) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 71148524edf9415e4c488bcb41755cd1b3b49fd8) @@ -728,7 +728,6 @@ AssertSlipPlaneConstraints(originalInput, actualInput.SlipPlaneConstraints); Assert.AreEqual(WaternetCreationMode.CreateWaternet, actualInput.WaternetCreationMode); Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, actualInput.PlLineCreationMethod); - Assert.AreEqual(LandwardDirection.PositiveX, actualInput.LandwardDirection); Assert.AreSame(originalInput.SurfaceLine, actualInput.SurfaceLine); Assert.AreEqual(expectedAssessmentLevel, actualInput.AssessmentLevel); Assert.AreEqual(originalInput.DikeSoilScenario, actualInput.DikeSoilScenario);