Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs
===================================================================
diff -u -r16b01f208966fa77f73b7977db23da94786f08d1 -r8832cfacbfb0a999d9dd5ddcb93fd81bdb2fb09f
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 16b01f208966fa77f73b7977db23da94786f08d1)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 8832cfacbfb0a999d9dd5ddcb93fd81bdb2fb09f)
@@ -47,9 +47,6 @@
private RoundedDouble entryPointL;
private RingtoetsPipingSurfaceLine surfaceLine;
- private PipingSoilProfile soilProfile;
- private HydraulicBoundaryLocation hydraulicBoundaryLocation;
-
///
/// Initializes a new instance of the class.
///
@@ -150,30 +147,41 @@
///
/// Gets or sets the profile which contains a 1 dimensional definition of soil layers with properties.
///
- public PipingSoilProfile SoilProfile
- {
- get
- {
- return soilProfile;
- }
- set
- {
- soilProfile = value;
- }
- }
+ public StochasticSoilProfile StochasticSoilProfile { get; set; }
///
/// Gets or set the hydraulic boundary location from which to use the assessment level.
///
- public HydraulicBoundaryLocation HydraulicBoundaryLocation
+ public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; }
+
+ private void UpdateEntryAndExitPoint()
{
- get
+ if (SurfaceLine == null)
{
- return hydraulicBoundaryLocation;
+ ExitPointL = (RoundedDouble) double.NaN;
}
- set
+ else
{
- hydraulicBoundaryLocation = value;
+ int entryPointIndex = Array.IndexOf(SurfaceLine.Points, SurfaceLine.DikeToeAtRiver);
+ int exitPointIndex = Array.IndexOf(SurfaceLine.Points, SurfaceLine.DikeToeAtPolder);
+
+ Point2D[] localGeometry = SurfaceLine.ProjectGeometryToLZ().ToArray();
+
+ double tempEntryPointL = localGeometry[0].X;
+ double tempExitPointL = localGeometry[localGeometry.Length - 1].X;
+
+ bool isDifferentPoints = entryPointIndex < 0 || exitPointIndex < 0 || entryPointIndex < exitPointIndex;
+ if (isDifferentPoints && exitPointIndex > 0)
+ {
+ tempExitPointL = localGeometry.ElementAt(exitPointIndex).X;
+ }
+ if (isDifferentPoints && entryPointIndex > -1)
+ {
+ tempEntryPointL = localGeometry.ElementAt(entryPointIndex).X;
+ }
+
+ ExitPointL = (RoundedDouble) tempExitPointL;
+ EntryPointL = (RoundedDouble) tempEntryPointL;
}
}
@@ -459,36 +467,5 @@
}
#endregion
-
- private void UpdateEntryAndExitPoint()
- {
- if (SurfaceLine == null)
- {
- ExitPointL = (RoundedDouble)double.NaN;
- }
- else
- {
- int entryPointIndex = Array.IndexOf(SurfaceLine.Points, SurfaceLine.DikeToeAtRiver);
- int exitPointIndex = Array.IndexOf(SurfaceLine.Points, SurfaceLine.DikeToeAtPolder);
-
- Point2D[] localGeometry = SurfaceLine.ProjectGeometryToLZ().ToArray();
-
- double tempEntryPointL = localGeometry[0].X;
- double tempExitPointL = localGeometry[localGeometry.Length - 1].X;
-
- bool isDifferentPoints = entryPointIndex < 0 || exitPointIndex < 0 || entryPointIndex < exitPointIndex;
- if (isDifferentPoints && exitPointIndex > 0)
- {
- tempExitPointL = localGeometry.ElementAt(exitPointIndex).X;
- }
- if (isDifferentPoints && entryPointIndex > -1)
- {
- tempEntryPointL = localGeometry.ElementAt(entryPointIndex).X;
- }
-
- ExitPointL = (RoundedDouble)tempExitPointL;
- EntryPointL = (RoundedDouble)tempEntryPointL;
- }
- }
}
}
\ No newline at end of file