Index: DamTools/GeometryVisualizer/Geometry.json
===================================================================
diff -u -r4867 -r5368
--- DamTools/GeometryVisualizer/Geometry.json (.../Geometry.json) (revision 4867)
+++ DamTools/GeometryVisualizer/Geometry.json (.../Geometry.json) (revision 5368)
@@ -5,63 +5,109 @@
"Curves": [
{
"HeadPoint": {
- "X": 0,
+ "X": -70,
+ "Z": -5
+ },
+ "EndPoint": {
+ "X": -60,
"Z": 0
+ }
+ },
+ {
+ "HeadPoint": {
+ "X": -60,
+ "Z": 0
},
"EndPoint": {
- "X": 5,
- "Z": 10
+ "X": -50,
+ "Z": 0
}
},
{
"HeadPoint": {
- "X": 5,
- "Z": 10
+ "X": -50,
+ "Z": 0
},
"EndPoint": {
- "X": 10,
- "Z": 10
+ "X": -40,
+ "Z": -5
}
},
{
"HeadPoint": {
- "X": 10,
- "Z": 10
+ "X": -40,
+ "Z": -5
},
"EndPoint": {
- "X": 10,
+ "X": -70,
"Z": -5
}
+ }
+ ]
+ }
+ },
+ {
+ "OuterLoop": {
+ "Curves": [
+ {
+ "HeadPoint": {
+ "X": -100,
+ "Z": -5
+ },
+ "EndPoint": {
+ "X": -70,
+ "Z": -5
+ }
},
{
"HeadPoint": {
- "X": 10,
+ "X": -70,
"Z": -5
},
"EndPoint": {
- "X": 5,
+ "X": -40,
"Z": -5
}
},
{
"HeadPoint": {
- "X": 5,
+ "X": -40,
"Z": -5
},
"EndPoint": {
- "X": 0,
+ "X": -10,
"Z": -5
}
},
{
"HeadPoint": {
- "X": 0,
+ "X": -10,
"Z": -5
},
"EndPoint": {
"X": 0,
- "Z": 0
+ "Z": -10
}
+ },
+ {
+ "HeadPoint": {
+ "X": 0,
+ "Z": -10
+ },
+ "EndPoint": {
+ "X": -100,
+ "Z": -10
+ }
+ },
+ {
+ "HeadPoint": {
+ "X": -100,
+ "Z": -10
+ },
+ "EndPoint": {
+ "X": -100,
+ "Z": -5
+ }
}
]
}
@@ -71,129 +117,175 @@
"Curves": [
{
"HeadPoint": {
- "X": 10,
+ "X": 30,
"Z": -5
},
"EndPoint": {
- "X": 5,
+ "X": 40,
"Z": -5
}
},
{
"HeadPoint": {
- "X": 10,
+ "X": 40,
"Z": -5
},
"EndPoint": {
- "X": 10,
- "Z": -8
+ "X": 40,
+ "Z": -10
}
},
{
"HeadPoint": {
- "X": 10,
- "Z": -8
+ "X": 40,
+ "Z": -10
},
"EndPoint": {
- "X": 5,
- "Z": -8
+ "X": 20,
+ "Z": -10
}
},
{
"HeadPoint": {
- "X": 5,
- "Z": -8
+ "X": 20,
+ "Z": -10
},
"EndPoint": {
+ "X": 30,
+ "Z": -5
+ }
+ }
+ ]
+ }
+ },
+ {
+ "OuterLoop": {
+ "Curves": [
+ {
+ "HeadPoint": {
+ "X": -100,
+ "Z": -10
+ },
+ "EndPoint": {
"X": 0,
- "Z": -8
+ "Z": -10
}
},
{
"HeadPoint": {
"X": 0,
- "Z": -8
+ "Z": -10
},
"EndPoint": {
- "X": 0,
- "Z": -5
+ "X": 5,
+ "Z": -12.5
}
},
{
"HeadPoint": {
"X": 5,
- "Z": -5
+ "Z": -12.5
},
"EndPoint": {
- "X": 0,
- "Z": -5
+ "X": 15,
+ "Z": -12.5
}
- }
- ]
- }
- },
- {
- "OuterLoop": {
- "Curves": [
+ },
{
"HeadPoint": {
- "X": 10,
- "Z": -8
+ "X": 15,
+ "Z": -12.5
},
"EndPoint": {
- "X": 5,
- "Z": -8
+ "X": 20,
+ "Z": -10
}
},
{
"HeadPoint": {
- "X": 10,
- "Z": -8
+ "X": 20,
+ "Z": -10
},
"EndPoint": {
- "X": 10,
+ "X": 40,
"Z": -10
}
},
{
"HeadPoint": {
- "X": 10,
+ "X": 40,
"Z": -10
},
"EndPoint": {
- "X": 5,
- "Z": -10
+ "X": 40,
+ "Z": -15
}
},
{
"HeadPoint": {
- "X": 5,
- "Z": -10
+ "X": 40,
+ "Z": -15
},
"EndPoint": {
- "X": 0,
- "Z": -10
+ "X": -100,
+ "Z": -15
}
},
{
"HeadPoint": {
- "X": 0,
+ "X": -100,
+ "Z": -15
+ },
+ "EndPoint": {
+ "X": -100,
"Z": -10
+ }
+ }
+ ]
+ }
+ },
+ {
+ "OuterLoop": {
+ "Curves": [
+ {
+ "HeadPoint": {
+ "X": -100,
+ "Z": -15
},
"EndPoint": {
- "X": 0,
- "Z": -8
+ "X": 40,
+ "Z": -15
}
},
{
"HeadPoint": {
- "X": 5,
- "Z": -8
+ "X": 40,
+ "Z": -15
},
"EndPoint": {
- "X": 0,
- "Z": -8
+ "X": 40,
+ "Z": -20
}
+ },
+ {
+ "HeadPoint": {
+ "X": 40,
+ "Z": -20
+ },
+ "EndPoint": {
+ "X": -100,
+ "Z": -20
+ }
+ },
+ {
+ "HeadPoint": {
+ "X": -100,
+ "Z": -20
+ },
+ "EndPoint": {
+ "X": -100,
+ "Z": -15
+ }
}
]
}
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml
===================================================================
diff -u -r4836 -r5368
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml (.../InputForDebugging.xml) (revision 4836)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/InputForDebugging.xml (.../InputForDebugging.xml) (revision 5368)
@@ -1,1182 +1,606 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs
===================================================================
diff -u -r4898 -r5368
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 4898)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DebuggingTest.cs (.../DebuggingTest.cs) (revision 5368)
@@ -22,6 +22,7 @@
using System.Globalization;
using System.IO;
using System.Threading;
+using Deltares.DamEngine.Data.GeometryExport;
using Deltares.DamEngine.Interface;
using Deltares.DamEngine.TestHelpers;
using NUnit.Framework;
@@ -39,15 +40,21 @@
/// 2) Copy the file to src\Deltares.DamEngine.IntegrationTests\TestFiles\InputForDebugging.xml
/// 3) Run the test in Debugging mode
///
- [Test, Ignore("This test is only used for debugging XML files generated by Dam UI")]
+ [Test]//, Ignore("This test is only used for debugging XML files generated by Dam UI")]
public void DebugWithXmlInputFile()
{
const string inputFilename = "InputForDebugging.xml";
+ // const string visualizationFolder = @"D:\src\dam\DamTools\GeometryVisualizer\"; //#Tom
string fullInputFilename = Path.Combine(mapTestFiles, inputFilename);
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
string inputString = File.ReadAllText(fullInputFilename);
var outputName = "OutputForDebugging.xml";
var engineInterface = new EngineInterface(inputString);
+ var geometry = engineInterface.DamProjectData.Dike.Locations[0].Segment.SoilProfileProbabilities[0].SoilProfile2D.Geometry;
+ // Use the following code to export the geometry to a file
+ // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt");
+ // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json");
+
GeneralHelper.RunAfterInputValidation(engineInterface, true, outputName);
int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages);
Assert.That(errorCount, Is.EqualTo(0), "There should be nor errors during the calculation.");
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/soilmaterials.mds'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/characteristicpoints.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5365 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/CommandLineArgumentParser.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CommandOptions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/scenarios.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/surfacelines.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5365 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/RdLatLngConverter.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/Geometries/2A-37-bishop-binnen.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/Geometries/1C-31,5-bishop-binnen.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/soilmaterials.mdb
===================================================================
diff -u -r5364 -r5368
Binary files differ
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Properties/Settings.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Properties/Settings.settings'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/CsvToDamxConverter.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5365 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/locations.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5365 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/GeoXY2LatLong.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/locations.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/segments.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/Geometries/1D-34-bishop-binnen.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5364 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/CsvToDamxConverter/TestData/CsvToDamXConverter/modelparameters.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5365 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Tools/GeoXY2LatLong/Program.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/GeoXY2LatLong/GeoXY2LatLong.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/GeoXY2LatLong/CommandLineArgumentParser.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/GeoXY2LatLong/Program.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/GeoXY2LatLong/locations.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/GeoXY2LatLong/RdLatLngConverter.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/Geometries/1C-31,5-bishop-binnen.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/modelparameters.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/Geometries/2A-37-bishop-binnen.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/CommandOptions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/Properties/Settings.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/soilmaterials.mdb
===================================================================
diff -u -r5364 -r5368
Binary files differ
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/locations.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/Program.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/scenarios.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/segments.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/Geometries/1D-34-bishop-binnen.sti'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/soilmaterials.mds'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/characteristicpoints.csv'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/CsvToDamxConverter.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/Properties/Settings.settings'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5368 refers to a dead (removed) revision in file `DamTools/CsvToDamxConverter/TestData/CsvToDamXConverter/surfacelines.csv'.
Fisheye: No comparison available. Pass `N' to diff?