Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs =================================================================== diff -u -r5289 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs (.../GeometryHelperTests.cs) (revision 5289) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryHelperTests.cs (.../GeometryHelperTests.cs) (revision 5386) @@ -30,30 +30,17 @@ [TestFixture] public class GeometryHelperTests { - // For debugging purposes - //private const string visualizationFolder = @"C:\Dam\DamTools\GeometryVisualizer\"; //#John - //private const string visualizationFolder = @"D:\src\dam\DamTools\GeometryVisualizer\"; //#Tom - // Use the following code to export the geometry to a file - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - const double cTolerance = 1e-6; [Test] public void GivenTwoLayerGeometryWhenExtendingLeftThenLeftBoundaryIsChanged() { // Given SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithThreeLayers(); - // For debugging purposes - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - + // When GeometryHelper.ExtendGeometryLeft(soilProfile2D.Geometry, -2); - // For debugging purposes - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - + // Then GeometryBounds geometryBounds = soilProfile2D.Geometry.GetGeometryBounds(); Assert.Multiple(() => @@ -87,10 +74,7 @@ // When GeometryHelper.ExtendGeometryRight(soilProfile2D.Geometry, 12); - // For debugging purposes - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - + // Then Assert.Multiple(() => { @@ -119,16 +103,10 @@ { // Given SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithThreeLayers(); - // For debugging purposes - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - + // When GeometryHelper.CutGeometryLeft(soilProfile2D.Geometry, 2); - // For debugging purposes - //GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - //GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - + // Then GeometryBounds geometryBounds = soilProfile2D.Geometry.GetGeometryBounds(); Assert.Multiple(() => @@ -149,16 +127,10 @@ { // Given SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithThreeLayers(); - // For debugging purposes - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - + // When GeometryHelper.CutGeometryRight(soilProfile2D.Geometry, 8); - // For debugging purposes - //GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - //GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - + // Then GeometryBounds geometryBounds = soilProfile2D.Geometry.GetGeometryBounds(); Assert.Multiple(() => Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs =================================================================== diff -u -r5287 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs (.../SoilProfile2DSurfaceLineHelperTests.cs) (revision 5287) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DSurfaceLineHelperTests.cs (.../SoilProfile2DSurfaceLineHelperTests.cs) (revision 5386) @@ -32,14 +32,6 @@ [TestFixture] public class SoilProfile2DSurfaceLineHelperTests { - // For debugging purposes - // For debugging purposes - //private const string visualizationFolder = @"C:\Dam\DamTools\GeometryVisualizer\"; //#John - //private const string visualizationFolder = @"D:\src\dam\DamTools\GeometryVisualizer\"; //#Tom - // Use the following code to export the geometry to a file - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - private static IEnumerable SurfaceLinesTestCases { get @@ -320,9 +312,6 @@ { // Given SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithTwoLayers(); - // For debugging purposes - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); SurfaceLine2 surfaceLine = CreateSurfaceLineForSoilProfile2D(soilProfile2D, positionToSoilProfile2D); // When-Then @@ -334,19 +323,13 @@ { // Given SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithThreeLayers(); - // For debugging purposes - //GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - //GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); var defaultSoil = new Soil { Name = "dikemat" }; SoilProfile2D newSoilProfile2D = SoilProfile2DSurfaceLineHelper.CombineSurfaceLineWithSoilProfile2D( testCaseSurfaceLine.SurfaceLine.Geometry, soilProfile2D, defaultSoil, 0); Assert.That(newSoilProfile2D, Is.Not.Null); - // For debugging purposes - //GeometryExporter.ExportToFile(newSoilProfile2D.Geometry, visualizationFolder + "Geometry" + testCaseSurfaceLine.TestNumber + ".txt"); - //GeometryExporter.ExportToJsonFile(newSoilProfile2D.Geometry, visualizationFolder + "Geometry" + testCaseSurfaceLine.TestNumber + ".json"); Assert.That(newSoilProfile2D.Surfaces, Has.Count.EqualTo(testCaseSurfaceLine.SurfaceCount)); } @@ -355,19 +338,13 @@ { // Given SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithSixSurfacesFormingTwoLayers(); - // For debugging purposes - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); var defaultSoil = new Soil { Name = "Filling material" }; // When SoilProfile2D newSoilProfile2D = SoilProfile2DSurfaceLineHelper.CombineSurfaceLineWithSoilProfile2D( testCaseSurfaceLine.GivenZigZagSurfaceLine.Geometry, soilProfile2D, defaultSoil, 0); - // For debugging purposes - //GeometryExporter.ExportToFile(newSoilProfile2D.Geometry, visualizationFolder + "Geometry" + testCaseSurfaceLine.TestNumber + ".txt"); - //GeometryExporter.ExportToJsonFile(newSoilProfile2D.Geometry, visualizationFolder + "Geometry" + testCaseSurfaceLine.TestNumber + ".json"); // Then if (testCaseSurfaceLine.ExpectedSurfaceCount == 0) @@ -463,17 +440,6 @@ public int TestNumber { get; init; } } - /// - /// To indicate the position of the surface line to the soil profile. - /// - public enum PositionToSoilProfile2D - { - LeftOfSoilProfile, - RightOfSoilProfile, - OnSoilProfile, - InsideOfSoilProfile - } - private static SurfaceLine2 CreateSurfaceLineForSoilProfile2D(SoilProfile2D soilProfile2D, PositionToSoilProfile2D positionToSoilProfile2D) { GeometryPoint geometryPoint = soilProfile2D.Geometry.SurfaceLine.Points.First(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs =================================================================== diff -u -r5302 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 5302) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs (.../FillMacroStabilityWrapperInputFromEngine.cs) (revision 5386) @@ -239,6 +239,16 @@ kernelLoop.Curves = new List(); foreach (GeometryCurve geometryCurve in damLoop.CurveList) { + if (!curvesDictionary.ContainsKey(geometryCurve)) + { + var kernelCurve = new Curve + { + HeadPoint = pointsDictionary[geometryCurve.HeadPoint], + EndPoint = pointsDictionary[geometryCurve.EndPoint] + }; + curvesDictionary.Add(geometryCurve, kernelCurve); + } + kernelLoop.Curves.Add(curvesDictionary[geometryCurve]); } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryConstants.cs =================================================================== diff -u -r4984 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryConstants.cs (.../GeometryConstants.cs) (revision 4984) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryConstants.cs (.../GeometryConstants.cs) (revision 5386) @@ -55,19 +55,5 @@ /// The volumic weight of water /// public const double VolumicWeightOfWater = 9.81; -} - -/// -/// Pointtype as used by intersection methods and other helper methods to determine for which plane the method has to work. -/// -// public enum PointType -// { -// /// -// /// The xy plane -// /// -// XY, -// /// -// /// The xz plane -// /// -// XZ -// } \ No newline at end of file + +} \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs =================================================================== diff -u -r5290 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 5290) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForSoilProfiles.cs (.../FactoryForSoilProfiles.cs) (revision 5386) @@ -29,6 +29,17 @@ namespace Deltares.DamEngine.TestHelpers.Factories; +/// +/// To indicate the position of the surface line to the soil profile. +/// +public enum PositionToSoilProfile2D +{ + LeftOfSoilProfile, + RightOfSoilProfile, + OnSoilProfile, + InsideOfSoilProfile +} + public static class FactoryForSoilProfiles { /// @@ -1354,7 +1365,49 @@ return soilLayer2D; } + + /// + /// Creates a surface line for a soil profile 2D at the requested postion. + /// + /// + /// + /// + public static SurfaceLine2 CreateSurfaceLineForSoilProfile2D(SoilProfile2D soilProfile2D, PositionToSoilProfile2D positionToSoilProfile2D) + { + GeometryPoint geometryPoint = soilProfile2D.Geometry.SurfaceLine.Points.First(); + var leftPoint = new GeometryPoint(geometryPoint.X, geometryPoint.Z); + geometryPoint = soilProfile2D.Geometry.SurfaceLine.Points.Last(); + var rightPoint = new GeometryPoint(geometryPoint.X, geometryPoint.Z); + var middlePoint = new GeometryPoint((leftPoint.X + rightPoint.X) / 2, (leftPoint.Z + rightPoint.Z) / 2); + switch (positionToSoilProfile2D) + { + case PositionToSoilProfile2D.LeftOfSoilProfile: + leftPoint.X -= 1; + break; + case PositionToSoilProfile2D.RightOfSoilProfile: + rightPoint.X += 1; + break; + case PositionToSoilProfile2D.OnSoilProfile: + break; + case PositionToSoilProfile2D.InsideOfSoilProfile: + leftPoint.X += 1; + rightPoint.X -= 1; + break; + } + SurfaceLine2 surfaceLine = CreateSurfaceLine(new[] + { + leftPoint, + middlePoint, + rightPoint + }); + surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint(surfaceLine.CharacteristicPoints, leftPoint)); + surfaceLine.CharacteristicPoints.Annotate(0, CharacteristicPointType.SurfaceLevelOutside); + surfaceLine.CharacteristicPoints.Add(new CharacteristicPoint(surfaceLine.CharacteristicPoints, rightPoint)); + surfaceLine.CharacteristicPoints.Annotate(1, CharacteristicPointType.SurfaceLevelInside); + return surfaceLine; + } + private static void AddPointIfNotYetPresentInGeometry(SoilProfile2D soilProfile, Point2D point) { if (!soilProfile.Geometry.Points.Any(p => p.X.IsNearEqual(point.X) && p.Z.IsNearEqual(point.Z))) Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryExporterTests.cs =================================================================== diff -u --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryExporterTests.cs (revision 0) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/GeometryExporterTests.cs (revision 5386) @@ -0,0 +1,110 @@ +// Copyright (C) Stichting Deltares 2024. All rights reserved. +// +// This file is part of the Dam Engine. +// +// The Dam Engine is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero 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 Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero 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.IO; +using System.Text.Json; +using Deltares.DamEngine.Data.Geometry; +using Deltares.DamEngine.Data.GeometryExport; +using Deltares.DamEngine.Data.Geotechnics; +using Deltares.DamEngine.TestHelpers.Factories; +using NUnit.Framework; + +namespace Deltares.DamEngine.Data.Tests.Geotechnics; + +[TestFixture] +public class GeometryExporterTests +{ + [Test] + [TestCase(false)] + [TestCase(true)] + public void TestExportWithSurfaceLineToJsonFile(bool withSurfaceline) + { + // Arrange + SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithTwoLayers(); + SurfaceLine2 surfaceLine = null; + GeometryPointString geometryOfSurf = null; + if (withSurfaceline) + { + surfaceLine = FactoryForSoilProfiles.CreateSurfaceLineForSoilProfile2D(soilProfile2D, + PositionToSoilProfile2D.LeftOfSoilProfile); + geometryOfSurf = surfaceLine.Geometry; + } + + // Act + string fileName = "test.json"; + GeometryExporter.ExportWithSurfaceLineToJsonFile(fileName, soilProfile2D.Geometry, geometryOfSurf); + + // Assert + // Check if the file exists + Assert.That(File.Exists(fileName), Is.True); + string output = File.ReadAllText(fileName); + PersistableGeometryWithSurfaceLine persistableGeometryWithSurfaceLine = + JsonSerializer.Deserialize(output); + + Assert.That(persistableGeometryWithSurfaceLine.Geometry.Surfaces.Count, Is.EqualTo(2)); + if (withSurfaceline) + { + Assert.That(persistableGeometryWithSurfaceLine.SurfaceLine.Points.Count, Is.EqualTo(3)); + } + else + { + Assert.That(persistableGeometryWithSurfaceLine.SurfaceLine, Is.Null); + } + } + + [Test] + public void TestExportToFile() + { + // Arrange + SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithTwoLayers(); + + // Act + string fileName = "TestWriteGeometryToTextFile.txt"; + GeometryExporter.ExportToFile(soilProfile2D.Geometry, fileName); + + // Assert + // Check if the file exists + Assert.That(File.Exists(fileName), Is.True); + string output = File.ReadAllText(fileName); + Assert.That(output.Length, Is.EqualTo(725)); + + } + + [Test] + public void TestExportSurfaceLineToFile() + { + // Arrange + SoilProfile2D soilProfile2D = FactoryForSoilProfiles.CreateSoilProfile2DWithTwoLayers(); + SurfaceLine2 surfaceLine = FactoryForSoilProfiles.CreateSurfaceLineForSoilProfile2D(soilProfile2D, + PositionToSoilProfile2D.LeftOfSoilProfile); + GeometryPointString geometryOfSurf = surfaceLine.Geometry; + + // Act + string fileName = "TestWriteSurfaceLineToTextFile.txt"; + GeometryExporter.ExportSurfacelineToFile(geometryOfSurf, fileName); + + // Assert + // Check if the file exists + Assert.That(File.Exists(fileName), Is.True); + string output = File.ReadAllText(fileName); + Assert.That(output.Length, Is.EqualTo(116)); + } +} \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs =================================================================== diff -u -r5289 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs (.../MacroStabilityCommonHelperTests.cs) (revision 5289) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs (.../MacroStabilityCommonHelperTests.cs) (revision 5386) @@ -34,8 +34,6 @@ [TestFixture] public class MacroStabilityCommonHelperTests { - // For debugging purposes - private const string visualizationFolder = @"D:\src\dam\DamTools\GeometryVisualizer\"; private readonly double cTolerance = 0.001; [Test] @@ -45,9 +43,7 @@ SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineWithDikeAndDitch(); var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -71,9 +67,7 @@ // Now combine the soilGeometryProbability with the same SurfaceLine2 which should result in the same SoilProfile2D MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -101,9 +95,6 @@ // being cut on the left with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -131,9 +122,6 @@ // being extended to the left with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -157,9 +145,7 @@ // being cut on the right with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -187,9 +173,7 @@ // being extended to the right with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -210,8 +194,9 @@ var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + // GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + "Geometry.txt"); + // GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + + // GeometryExporter.ExportJasonFile, geometry, surfaceLine.Geometry); Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -232,9 +217,7 @@ // SoilProfile2D is removed (between top boundary of the SoilProfile2D and the surfaceLine) var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -255,9 +238,7 @@ // SoilProfile2D is removed (between top boundary of the SoilProfile2D and the surfaceLine) var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs =================================================================== diff -u -r5289 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs (.../SoilSurfaceProfileTests.cs) (revision 5289) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilSurfaceProfileTests.cs (.../SoilSurfaceProfileTests.cs) (revision 5386) @@ -31,9 +31,6 @@ [TestFixture] public class SoilSurfaceProfileTests { - // For debugging purposes - private const string visualizationFolder = @"D:\src\dam\DamTools\GeometryVisualizer\"; - [Test] public void GivenProfile1DWithOneLayerAndSurfaceLineWhenConverToProfile2DThenCorrectSoilProfile2DIsCreated() { @@ -66,9 +63,6 @@ }; SoilProfile2D soilProfile2D = soilSurfaceProfile.ConvertToSoilProfile2D(); - // For debugging purposes - // GeometryExporter.ExportToFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(soilProfile2D.Geometry, visualizationFolder + "Geometry.json"); // Then SoilProfile2D is created Assert.Multiple(() => {