Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj
===================================================================
diff -u -r3185 -r3192
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj (.../Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj) (revision 3185)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj (.../Deltares.LayerOnSlopeTool.LayerCreator.Tests.csproj) (revision 3192)
@@ -30,7 +30,7 @@
-
+
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/SurfacelineProcessorTests.cs
===================================================================
diff -u -r3186 -r3192
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/SurfacelineProcessorTests.cs (.../SurfacelineProcessorTests.cs) (revision 3186)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator.Tests/SurfacelineProcessorTests.cs (.../SurfacelineProcessorTests.cs) (revision 3192)
@@ -25,71 +25,71 @@
namespace Deltares.LayerOnSlopeTool.LayerCreator.Tests
{
[TestFixture]
- public class SurfacelineProcessorTests
+ public class SurfaceLineProcessorTests
{
- private const double tolerance = 0.001;
+ private const double Tolerance = 0.001;
[Test]
public void TestDetermineLoweredSurfaceLineForGivenLayerThickness()
{
var originalSurfaceLine = CreateSimpleStraightSurfaceLine();
- var surfacelineProcessor = new SurfacelineProcessor(originalSurfaceLine);
+ var surfacelineProcessor = new SurfaceLineProcessor(originalSurfaceLine);
var loweredSurfaceLine = surfacelineProcessor.CreateLoweredSurfaceLine(1);
Assert.AreEqual(11, loweredSurfaceLine.SurfaceLinePoints.Count);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].ZCoordinate, tolerance);
- Assert.AreEqual(5, loweredSurfaceLine.SurfaceLinePoints[1].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[1].ZCoordinate, tolerance);
- Assert.AreEqual(10, loweredSurfaceLine.SurfaceLinePoints[2].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[2].ZCoordinate, tolerance);
- Assert.AreEqual(12, loweredSurfaceLine.SurfaceLinePoints[3].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[3].ZCoordinate, tolerance);
- Assert.AreEqual(14, loweredSurfaceLine.SurfaceLinePoints[4].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[4].ZCoordinate, tolerance);
- Assert.AreEqual(14.01, loweredSurfaceLine.SurfaceLinePoints[5].XCoordinate, tolerance);
- Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[5].ZCoordinate, tolerance);
- Assert.AreEqual(15, loweredSurfaceLine.SurfaceLinePoints[6].XCoordinate, tolerance);
- Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[6].ZCoordinate, tolerance);
- Assert.AreEqual(15.99, loweredSurfaceLine.SurfaceLinePoints[7].XCoordinate, tolerance);
- Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[7].ZCoordinate, tolerance);
- Assert.AreEqual(16, loweredSurfaceLine.SurfaceLinePoints[8].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[8].ZCoordinate, tolerance);
- Assert.AreEqual(22, loweredSurfaceLine.SurfaceLinePoints[9].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[9].ZCoordinate, tolerance);
- Assert.AreEqual(30, loweredSurfaceLine.SurfaceLinePoints[10].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[10].ZCoordinate, tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].ZCoordinate, Tolerance);
+ Assert.AreEqual(5, loweredSurfaceLine.SurfaceLinePoints[1].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[1].ZCoordinate, Tolerance);
+ Assert.AreEqual(10, loweredSurfaceLine.SurfaceLinePoints[2].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[2].ZCoordinate, Tolerance);
+ Assert.AreEqual(12, loweredSurfaceLine.SurfaceLinePoints[3].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[3].ZCoordinate, Tolerance);
+ Assert.AreEqual(14, loweredSurfaceLine.SurfaceLinePoints[4].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[4].ZCoordinate, Tolerance);
+ Assert.AreEqual(14.01, loweredSurfaceLine.SurfaceLinePoints[5].XCoordinate, Tolerance);
+ Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[5].ZCoordinate, Tolerance);
+ Assert.AreEqual(15, loweredSurfaceLine.SurfaceLinePoints[6].XCoordinate, Tolerance);
+ Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[6].ZCoordinate, Tolerance);
+ Assert.AreEqual(15.99, loweredSurfaceLine.SurfaceLinePoints[7].XCoordinate, Tolerance);
+ Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[7].ZCoordinate, Tolerance);
+ Assert.AreEqual(16, loweredSurfaceLine.SurfaceLinePoints[8].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[8].ZCoordinate, Tolerance);
+ Assert.AreEqual(22, loweredSurfaceLine.SurfaceLinePoints[9].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[9].ZCoordinate, Tolerance);
+ Assert.AreEqual(30, loweredSurfaceLine.SurfaceLinePoints[10].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[10].ZCoordinate, Tolerance);
}
[Test]
public void TestDetermineLoweredSurfaceLineForGivenLayerThicknessWithAckwardPoints()
{
var originalSurfaceLine = CreateSimpleStraightSurfaceLineWithAckwardPoints();
- var surfacelineProcessor = new SurfacelineProcessor(originalSurfaceLine);
+ var surfacelineProcessor = new SurfaceLineProcessor(originalSurfaceLine);
var loweredSurfaceLine = surfacelineProcessor.CreateLoweredSurfaceLine(1);
Assert.AreEqual(11, loweredSurfaceLine.SurfaceLinePoints.Count);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].ZCoordinate, tolerance);
- Assert.AreEqual(5, loweredSurfaceLine.SurfaceLinePoints[1].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[1].ZCoordinate, tolerance);
- Assert.AreEqual(10, loweredSurfaceLine.SurfaceLinePoints[2].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[2].ZCoordinate, tolerance);
- Assert.AreEqual(12, loweredSurfaceLine.SurfaceLinePoints[3].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[3].ZCoordinate, tolerance);
- Assert.AreEqual(14, loweredSurfaceLine.SurfaceLinePoints[4].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[4].ZCoordinate, tolerance);
- Assert.AreEqual(14.01, loweredSurfaceLine.SurfaceLinePoints[5].XCoordinate, tolerance);
- Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[5].ZCoordinate, tolerance);
- Assert.AreEqual(15.5, loweredSurfaceLine.SurfaceLinePoints[6].XCoordinate, tolerance);
- Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[6].ZCoordinate, tolerance);
- Assert.AreEqual(15.99, loweredSurfaceLine.SurfaceLinePoints[7].XCoordinate, tolerance);
- Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[7].ZCoordinate, tolerance);
- Assert.AreEqual(16, loweredSurfaceLine.SurfaceLinePoints[8].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[8].ZCoordinate, tolerance);
- Assert.AreEqual(22, loweredSurfaceLine.SurfaceLinePoints[9].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[9].ZCoordinate, tolerance);
- Assert.AreEqual(30, loweredSurfaceLine.SurfaceLinePoints[10].XCoordinate, tolerance);
- Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[10].ZCoordinate, tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[0].ZCoordinate, Tolerance);
+ Assert.AreEqual(5, loweredSurfaceLine.SurfaceLinePoints[1].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[1].ZCoordinate, Tolerance);
+ Assert.AreEqual(10, loweredSurfaceLine.SurfaceLinePoints[2].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[2].ZCoordinate, Tolerance);
+ Assert.AreEqual(12, loweredSurfaceLine.SurfaceLinePoints[3].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[3].ZCoordinate, Tolerance);
+ Assert.AreEqual(14, loweredSurfaceLine.SurfaceLinePoints[4].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[4].ZCoordinate, Tolerance);
+ Assert.AreEqual(14.01, loweredSurfaceLine.SurfaceLinePoints[5].XCoordinate, Tolerance);
+ Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[5].ZCoordinate, Tolerance);
+ Assert.AreEqual(15.5, loweredSurfaceLine.SurfaceLinePoints[6].XCoordinate, Tolerance);
+ Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[6].ZCoordinate, Tolerance);
+ Assert.AreEqual(15.99, loweredSurfaceLine.SurfaceLinePoints[7].XCoordinate, Tolerance);
+ Assert.AreEqual(-1, loweredSurfaceLine.SurfaceLinePoints[7].ZCoordinate, Tolerance);
+ Assert.AreEqual(16, loweredSurfaceLine.SurfaceLinePoints[8].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[8].ZCoordinate, Tolerance);
+ Assert.AreEqual(22, loweredSurfaceLine.SurfaceLinePoints[9].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[9].ZCoordinate, Tolerance);
+ Assert.AreEqual(30, loweredSurfaceLine.SurfaceLinePoints[10].XCoordinate, Tolerance);
+ Assert.AreEqual(0, loweredSurfaceLine.SurfaceLinePoints[10].ZCoordinate, Tolerance);
}
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/Deltares.LayerOnSlopeTool.LayerCreator.csproj
===================================================================
diff -u -r3186 -r3192
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/Deltares.LayerOnSlopeTool.LayerCreator.csproj (.../Deltares.LayerOnSlopeTool.LayerCreator.csproj) (revision 3186)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/Deltares.LayerOnSlopeTool.LayerCreator.csproj (.../Deltares.LayerOnSlopeTool.LayerCreator.csproj) (revision 3192)
@@ -46,7 +46,7 @@
-
+
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/SurfacelineProcessor.cs
===================================================================
diff -u -r3186 -r3192
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/SurfacelineProcessor.cs (.../SurfacelineProcessor.cs) (revision 3186)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/SurfacelineProcessor.cs (.../SurfacelineProcessor.cs) (revision 3192)
@@ -25,17 +25,17 @@
namespace Deltares.LayerOnSlopeTool.LayerCreator
{
///
- public class SurfacelineProcessor
+ public class SurfaceLineProcessor
{
- private const double tolerance = 1e-4;
- private const double horizontalOffset = 0.01;
+ private const double Tolerance = 1e-4;
+ private const double HorizontalOffset = 0.01;
private readonly SurfaceLine surfaceLine;
- private SurfaceLinePoint dikeTopPolder;
- private SurfaceLinePoint dikeToePolder;
+ private readonly SurfaceLinePoint dikeTopPolder;
+ private readonly SurfaceLinePoint dikeToePolder;
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
/// The org surface line.
- public SurfacelineProcessor(SurfaceLine orgSurfaceLine)
+ public SurfaceLineProcessor(SurfaceLine orgSurfaceLine)
{
surfaceLine = orgSurfaceLine;
dikeTopPolder = surfaceLine.GetSurfaceLinePointByType(CharacteristicPointType.DikeTopAtPolder);
@@ -57,10 +57,10 @@
}
else
{
- if (point.XCoordinate > dikeTopPolder.XCoordinate + horizontalOffset &&
- point.XCoordinate < dikeToePolder.XCoordinate - horizontalOffset)
+ if (point.XCoordinate > dikeTopPolder.XCoordinate + HorizontalOffset &&
+ point.XCoordinate < dikeToePolder.XCoordinate - HorizontalOffset)
{
- HandlePointsBetweenDiketopPolderAndDikeToePolder(layerThickness, point, loweredSurfaceLine);
+ HandlePointsBetweenDikeTopPolderAndDikeToePolder(layerThickness, point, loweredSurfaceLine);
}
else
{
@@ -71,7 +71,7 @@
return loweredSurfaceLine;
}
- private static void HandlePointsBetweenDiketopPolderAndDikeToePolder(double layerThickness,
+ private static void HandlePointsBetweenDikeTopPolderAndDikeToePolder(double layerThickness,
SurfaceLinePoint point, SurfaceLine loweredSurfaceLine)
{
var newPointLowered = new SurfaceLinePoint
@@ -86,11 +86,11 @@
private void HandlePointsAtDikeToePolderAndBeyond(double layerThickness,
SurfaceLinePoint point, SurfaceLine loweredSurfaceLine)
{
- if (Math.Abs(point.XCoordinate - dikeToePolder.XCoordinate) < tolerance)
+ if (Math.Abs(point.XCoordinate - dikeToePolder.XCoordinate) < Tolerance)
{
var newPointAtDikeToe = new SurfaceLinePoint
{
- XCoordinate = point.XCoordinate - horizontalOffset,
+ XCoordinate = point.XCoordinate - HorizontalOffset,
ZCoordinate = point.ZCoordinate - layerThickness,
PointType = CharacteristicPointType.None
};
@@ -119,11 +119,11 @@
PointType = point.PointType
};
loweredSurfaceLine.SurfaceLinePoints.Add(newPointUpToDikeTop);
- if (Math.Abs(point.XCoordinate - dikeTopPolder.XCoordinate) < tolerance)
+ if (Math.Abs(point.XCoordinate - dikeTopPolder.XCoordinate) < Tolerance)
{
var newPointAtDikeTop = new SurfaceLinePoint
{
- XCoordinate = point.XCoordinate + horizontalOffset,
+ XCoordinate = point.XCoordinate + HorizontalOffset,
ZCoordinate = point.ZCoordinate - layerThickness,
PointType = CharacteristicPointType.None
};
Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs
===================================================================
diff -u -r3191 -r3192
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs (.../LayerCreator.cs) (revision 3191)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs (.../LayerCreator.cs) (revision 3192)
@@ -206,7 +206,7 @@
private SurfaceLine DetermineSurfaceLineForGivenLayerData(SurfaceLine originalSurfaceLine, double layerThickness)
{
- var surfaceLineProcessor = new SurfacelineProcessor(originalSurfaceLine);
+ var surfaceLineProcessor = new SurfaceLineProcessor(originalSurfaceLine);
return surfaceLineProcessor.CreateLoweredSurfaceLine(layerThickness);
}
}