Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r6157 -r6196
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6157)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 6196)
@@ -53,71 +53,8 @@
     public const int CpBottomDitchDikeSide = 17; // Slootbodem dijkzijde
     public const int CpBottomDitchPolderSide = 18; // Slootbodem polderzijde
     public const int CpDitchPolderSide = 19; // Insteek sloot polderzijde
-    public const int CpSurfaceLevelInside = 25; // Maaiveld binnenwaarts        
+    public const int CpSurfaceLevelInside = 25; // Maaiveld binnenwaarts
 
-    public const int InputFailureMechanismStabilityInside = 0;
-    public const int InputFailureMechanismStabilityOutside = 1;
-    public const int InputFailureMechanismPiping = 2;
-
-    public const int InputSegmentFailureMechanismAll = 0;
-    public const int InputSegmentFailureMechanismStability = 1;
-    public const int InputSegmentFailureMechanismPiping = 2;
-    
-    /// <summary>
-    /// The input zone type no zones
-    /// </summary>
-    public const int InputZoneTypeNoZones = 0;
-
-    /// <summary>
-    /// The input zone type old zone area, this now translates to No Zones as Zone Area is no longer to be used.
-    /// </summary>
-    public const int InputZoneTypeOldZoneArea = 1;
-
-    /// <summary>
-    /// The input zone types forbidden zones
-    /// </summary>
-    public const int InputZoneTypesForbiddenZones = 2;
-
-    /// <summary>
-    /// The input search method grid
-    /// </summary>
-    public const int InputSearchMethodGrid = 0;
-
-    /// <summary>
-    /// The input search method genetic
-    /// </summary>
-    public const int InputSearchMethodGenetic = 1;
-
-    /// <summary>
-    /// The input search method BeeSwarm
-    /// </summary>
-    public const int InputSearchMethodBeeSwarm = 2;
-
-    /// <summary>
-    /// The input grid type automatic
-    /// </summary>
-    public const int InputGridTypeAutomatic = 0;
-
-    /// <summary>
-    /// The input grid type specified
-    /// </summary>
-    public const int InputGridTypeSpecified = 1;
-
-    /// <summary>
-    /// The input tangent lines on boundary lines
-    /// </summary>
-    public const int InputTangentLinesOnBoundaryLines = 0;
-
-    /// <summary>
-    /// The input tangent lines specified
-    /// </summary>
-    public const int InputTangentLinesSpecified = 1;
-    
-    /// <summary>
-    /// The input tangent lines automatic
-    /// </summary>
-    public const int InputTangentLinesAutomatic = 2;
-
     // Constants for translating to Enums TimeStepUnit
     public const uint TimeStepUnitSecond = 0;
     public const uint TimeStepUnitMinute = 1;
@@ -559,15 +496,15 @@
     /// </summary>
     /// <param name="soilProfileType">Type of the soil geometry.</param>
     /// <returns></returns>
-    public static int ConvertToInputSoilGeometryType(SoilProfileType soilProfileType)
+    public static SegmentSoilGeometryProbabilitySoilProfileType ConvertToInputSoilGeometryType(SoilProfileType soilProfileType)
     {
-        var translationTable = new Dictionary<SoilProfileType, int>
+        var translationTable = new Dictionary<SoilProfileType, SegmentSoilGeometryProbabilitySoilProfileType>
         {
             {
-                SoilProfileType.ProfileType1D, 0
+                SoilProfileType.ProfileType1D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D
             },
             {
-                SoilProfileType.ProfileType2D, 1
+                SoilProfileType.ProfileType2D, SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D
             }
         };
         return translationTable[soilProfileType];
@@ -578,15 +515,15 @@
     /// </summary>
     /// <param name="soilGeometryType">Type of the soil geometry.</param>
     /// <returns></returns>
-    public static SoilProfileType ConvertToSoilGeometryType(int soilGeometryType)
+    public static SoilProfileType ConvertToSoilGeometryType(SegmentSoilGeometryProbabilitySoilProfileType soilGeometryType)
     {
-        var translationTable = new Dictionary<int, SoilProfileType>
+        var translationTable = new Dictionary<SegmentSoilGeometryProbabilitySoilProfileType, SoilProfileType>
         {
             {
-                0, SoilProfileType.ProfileType1D
+                SegmentSoilGeometryProbabilitySoilProfileType.ProfileType1D, SoilProfileType.ProfileType1D
             },
             {
-                1, SoilProfileType.ProfileType2D
+                SegmentSoilGeometryProbabilitySoilProfileType.ProfileType2D, SoilProfileType.ProfileType2D
             }
         };
         return translationTable[soilGeometryType];
@@ -597,18 +534,18 @@
     /// </summary>
     /// <param name="failureMechanismSystemType">Type of the system failure mechanism.</param>
     /// <returns></returns>
-    public static int ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType)
+    public static InputFailureMechanismSystemType ConvertToInputFailureMechanismSystemType(FailureMechanismSystemType failureMechanismSystemType)
     {
-        var translationTable = new Dictionary<FailureMechanismSystemType, int>
+        var translationTable = new Dictionary<FailureMechanismSystemType, InputFailureMechanismSystemType>
         {
             {
-                FailureMechanismSystemType.StabilityInside, InputFailureMechanismStabilityInside
+                FailureMechanismSystemType.StabilityInside, InputFailureMechanismSystemType.StabilityInside
             },
             {
-                FailureMechanismSystemType.StabilityOutside, InputFailureMechanismStabilityOutside
+                FailureMechanismSystemType.StabilityOutside, InputFailureMechanismSystemType.StabilityOutside
             },
             {
-                FailureMechanismSystemType.Piping, InputFailureMechanismPiping
+                FailureMechanismSystemType.Piping, InputFailureMechanismSystemType.Piping
             }
         };
         return translationTable[failureMechanismSystemType];
@@ -619,18 +556,18 @@
     /// </summary>
     /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
     /// <returns></returns>
-    public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(int failureMechanismSystemType)
+    public static FailureMechanismSystemType ConvertToFailureMechanismSystemType(InputFailureMechanismSystemType failureMechanismSystemType)
     {
-        var translationTable = new Dictionary<int, FailureMechanismSystemType>
+        var translationTable = new Dictionary<InputFailureMechanismSystemType, FailureMechanismSystemType>
         {
             {
-                InputFailureMechanismStabilityInside, FailureMechanismSystemType.StabilityInside
+                InputFailureMechanismSystemType.StabilityInside, FailureMechanismSystemType.StabilityInside
             },
             {
-                InputFailureMechanismStabilityOutside, FailureMechanismSystemType.StabilityOutside
+                InputFailureMechanismSystemType.StabilityOutside, FailureMechanismSystemType.StabilityOutside
             },
             {
-                InputFailureMechanismPiping, FailureMechanismSystemType.Piping
+                InputFailureMechanismSystemType.Piping, FailureMechanismSystemType.Piping
             }
         };
         return translationTable[failureMechanismSystemType];
@@ -641,18 +578,18 @@
     /// </summary>
     /// <param name="segmentFailureMechanismType">Type of the segment failure mechanism.</param>
     /// <returns></returns>
-    public static int ConvertToInputSegmentFailureMechanismSystemType(SegmentFailureMechanismType segmentFailureMechanismType)
+    public static SegmentSoilGeometryProbabilitySegmentFailureMechanismType ConvertToInputSegmentFailureMechanismSystemType(SegmentFailureMechanismType segmentFailureMechanismType)
     {
-        var translationTable = new Dictionary<SegmentFailureMechanismType, int>
+        var translationTable = new Dictionary<SegmentFailureMechanismType, SegmentSoilGeometryProbabilitySegmentFailureMechanismType>
         {
             {
-                SegmentFailureMechanismType.All, InputSegmentFailureMechanismAll
+                SegmentFailureMechanismType.All, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All
             },
             {
-                SegmentFailureMechanismType.Stability, InputSegmentFailureMechanismStability
+                SegmentFailureMechanismType.Stability, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability
             },
             {
-                SegmentFailureMechanismType.Piping, InputSegmentFailureMechanismPiping
+                SegmentFailureMechanismType.Piping, SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping
             }
         };
         return translationTable[segmentFailureMechanismType];
@@ -663,18 +600,18 @@
     /// </summary>
     /// <param name="segmentFailureMechanismSystemType">Type of the failure mechanism system.</param>
     /// <returns></returns>
-    public static SegmentFailureMechanismType ConvertToSegmentFailureMechanismSystemType(int segmentFailureMechanismSystemType)
+    public static SegmentFailureMechanismType ConvertToSegmentFailureMechanismSystemType(SegmentSoilGeometryProbabilitySegmentFailureMechanismType segmentFailureMechanismSystemType)
     {
-        var translationTable = new Dictionary<int, SegmentFailureMechanismType>
+        var translationTable = new Dictionary<SegmentSoilGeometryProbabilitySegmentFailureMechanismType, SegmentFailureMechanismType>
         {
             {
-                InputSegmentFailureMechanismAll, SegmentFailureMechanismType.All
+                SegmentSoilGeometryProbabilitySegmentFailureMechanismType.All, SegmentFailureMechanismType.All
             },
             {
-                InputSegmentFailureMechanismStability, SegmentFailureMechanismType.Stability
+                SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Stability, SegmentFailureMechanismType.Stability
             },
             {
-                InputSegmentFailureMechanismPiping, SegmentFailureMechanismType.Piping
+                SegmentSoilGeometryProbabilitySegmentFailureMechanismType.Piping, SegmentFailureMechanismType.Piping
             }
         };
         return translationTable[segmentFailureMechanismSystemType];
@@ -849,15 +786,15 @@
     /// </summary>
     /// <param name="zoneType">Type of the zone.</param>
     /// <returns></returns>
-    public static int ConvertToInputZoneType(MStabZonesType zoneType)
+    public static LocationStabilityOptionsZoneType ConvertToInputZoneType(MStabZonesType zoneType)
     {
-        var translationTable = new Dictionary<MStabZonesType, int>
+        var translationTable = new Dictionary<MStabZonesType, LocationStabilityOptionsZoneType>
         {
             {
-                MStabZonesType.NoZones, InputZoneTypeNoZones
+                MStabZonesType.NoZones, LocationStabilityOptionsZoneType.NoZones
             },
             {
-                MStabZonesType.ForbiddenZone, InputZoneTypesForbiddenZones
+                MStabZonesType.ForbiddenZone, LocationStabilityOptionsZoneType.ForbiddenZones
             }
         };
         return translationTable[zoneType];
@@ -868,18 +805,15 @@
     /// </summary>
     /// <param name="inputZoneType">Type of the input zone.</param>
     /// <returns></returns>
-    public static MStabZonesType ConvertToZoneType(int inputZoneType)
+    public static MStabZonesType ConvertToZoneType(LocationStabilityOptionsZoneType inputZoneType)
     {
-        var translationTable = new Dictionary<int, MStabZonesType>
+        var translationTable = new Dictionary<LocationStabilityOptionsZoneType, MStabZonesType>
         {
             {
-                InputZoneTypeNoZones, MStabZonesType.NoZones
+                LocationStabilityOptionsZoneType.NoZones, MStabZonesType.NoZones
             },
             {
-                InputZoneTypeOldZoneArea, MStabZonesType.NoZones
-            },
-            {
-                InputZoneTypesForbiddenZones, MStabZonesType.ForbiddenZone
+                LocationStabilityOptionsZoneType.ForbiddenZones, MStabZonesType.ForbiddenZone
             }
         };
         return translationTable[inputZoneType];
@@ -890,15 +824,15 @@
     /// </summary>
     /// <param name="searchMethod">The search method.</param>
     /// <returns></returns>
-    public static int ConvertToInputSearchMethod(MStabSearchMethod searchMethod)
+    public static StabilityParametersSearchMethod ConvertToInputSearchMethod(MStabSearchMethod searchMethod)
     {
-        var translationTable = new Dictionary<MStabSearchMethod, int>
+        var translationTable = new Dictionary<MStabSearchMethod, StabilityParametersSearchMethod>
         {
             {
-                MStabSearchMethod.Grid, InputSearchMethodGrid
+                MStabSearchMethod.Grid, StabilityParametersSearchMethod.CalculationGrid
             },
             {
-                MStabSearchMethod.BeeSwarm, InputSearchMethodBeeSwarm
+                MStabSearchMethod.BeeSwarm, StabilityParametersSearchMethod.BeeSwarm
             }
         };
         return translationTable[searchMethod];
@@ -909,15 +843,15 @@
     /// </summary>
     /// <param name="searchMethod">The search method.</param>
     /// <returns></returns>
-    public static MStabSearchMethod ConvertToSearchMethod(int searchMethod)
+    public static MStabSearchMethod ConvertToSearchMethod(StabilityParametersSearchMethod searchMethod)
     {
-        var translationTable = new Dictionary<int, MStabSearchMethod>
+        var translationTable = new Dictionary<StabilityParametersSearchMethod, MStabSearchMethod>
         {
             {
-                InputSearchMethodGrid, MStabSearchMethod.Grid
+                StabilityParametersSearchMethod.CalculationGrid, MStabSearchMethod.Grid
             },
             {
-                InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm
+                StabilityParametersSearchMethod.BeeSwarm, MStabSearchMethod.BeeSwarm
             }
         };
         return translationTable[searchMethod];
@@ -977,22 +911,42 @@
     }
 
     /// <summary>
-    /// Converts to input grid determination.
+    /// Converts to Bishop input search area determination.
     /// </summary>
-    /// <param name="gridType">Type of the grid.</param>
+    /// <param name="searchAreaType">Type of the search area for Bishop.</param>
     /// <returns></returns>
-    public static int ConvertToInputGridDetermination(GridSizeDetermination gridType)
+    public static StabilityParametersBishopSearchAreaDetermination ConvertToInputBishopSearchAreaDetermination(GridSizeDetermination searchAreaType)
     {
-        var translationTable = new Dictionary<GridSizeDetermination, int>
+        var translationTable = new Dictionary<GridSizeDetermination, StabilityParametersBishopSearchAreaDetermination>
         {
             {
-                GridSizeDetermination.Automatic, InputGridTypeAutomatic
+                GridSizeDetermination.Automatic, StabilityParametersBishopSearchAreaDetermination.Automatic
             },
             {
-                GridSizeDetermination.Specified, InputGridTypeSpecified
+                GridSizeDetermination.Specified, StabilityParametersBishopSearchAreaDetermination.Specified
             }
         };
 
+        return translationTable[searchAreaType];
+    }
+    
+    /// <summary>
+    /// Converts to Uplift-Can input grid determination.
+    /// </summary>
+    /// <param name="gridType">Type of the grid for Uplift-Van.</param>
+    /// <returns></returns>
+    public static StabilityParametersUpliftVanGridDetermination ConvertToInputUpliftVanGridDetermination(GridSizeDetermination gridType)
+    {
+        var translationTable = new Dictionary<GridSizeDetermination, StabilityParametersUpliftVanGridDetermination>
+        {
+            {
+                GridSizeDetermination.Automatic, StabilityParametersUpliftVanGridDetermination.Automatic
+            },
+            {
+                GridSizeDetermination.Specified, StabilityParametersUpliftVanGridDetermination.Specified
+            }
+        };
+
         return translationTable[gridType];
     }
 
@@ -1023,21 +977,40 @@
     }
 
     /// <summary>
-    /// Converts to grid determination.
+    /// Converts to Bishop search area determination.
     /// </summary>
-    /// <param name="gridType">Type of the grid.</param>
+    /// <param name="searchAreaType">Type of the search area for Bishop.</param>
     /// <returns></returns>
-    public static GridSizeDetermination ConvertToGridDetermination(int gridType)
+    public static GridSizeDetermination ConvertToBishopSearchAreaDetermination(StabilityParametersBishopSearchAreaDetermination searchAreaType)
     {
-        var translationTable = new Dictionary<int, GridSizeDetermination>
+        var translationTable = new Dictionary<StabilityParametersBishopSearchAreaDetermination, GridSizeDetermination>
         {
             {
-                InputGridTypeAutomatic, GridSizeDetermination.Automatic
+                StabilityParametersBishopSearchAreaDetermination.Automatic, GridSizeDetermination.Automatic
             },
             {
-                InputGridTypeSpecified, GridSizeDetermination.Specified
+                StabilityParametersBishopSearchAreaDetermination.Specified, GridSizeDetermination.Specified
             }
         };
+        return translationTable[searchAreaType];
+    }
+    
+    /// <summary>
+    /// Converts to Uplift-Van grid determination.
+    /// </summary>
+    /// <param name="gridType">Type of the grid for Uplift-Van.</param>
+    /// <returns></returns>
+    public static GridSizeDetermination ConvertToUpliftVanGridDetermination(StabilityParametersUpliftVanGridDetermination gridType)
+    {
+        var translationTable = new Dictionary<StabilityParametersUpliftVanGridDetermination, GridSizeDetermination>
+        {
+            {
+                StabilityParametersUpliftVanGridDetermination.Automatic, GridSizeDetermination.Automatic
+            },
+            {
+                StabilityParametersUpliftVanGridDetermination.Specified, GridSizeDetermination.Specified
+            }
+        };
         return translationTable[gridType];
     }
 
@@ -1046,18 +1019,18 @@
     /// </summary>
     /// <param name="tangentLineType">Type of the tangent line.</param>
     /// <returns></returns>
-    public static int ConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType)
+    public static StabilityParametersUpliftVanTangentLinesDefinition ConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType)
     {
-        var translationTable = new Dictionary<TangentLinesDefinition, int>
+        var translationTable = new Dictionary<TangentLinesDefinition, StabilityParametersUpliftVanTangentLinesDefinition>
         {
             {
-                TangentLinesDefinition.OnBoundaryLines, InputTangentLinesOnBoundaryLines
+                TangentLinesDefinition.OnBoundaryLines, StabilityParametersUpliftVanTangentLinesDefinition.OnBoundaryLines
             },
             {
-                TangentLinesDefinition.Specified, InputTangentLinesSpecified
+                TangentLinesDefinition.Specified, StabilityParametersUpliftVanTangentLinesDefinition.Specified
             },
             {
-                TangentLinesDefinition.Automatic, InputTangentLinesAutomatic
+                TangentLinesDefinition.Automatic, StabilityParametersUpliftVanTangentLinesDefinition.Automatic
             }
         };
         return translationTable[tangentLineType];
@@ -1068,18 +1041,18 @@
     /// </summary>
     /// <param name="tangentLineType">Type of the tangent line.</param>
     /// <returns></returns>
-    public static TangentLinesDefinition ConvertToTangentLinesDefinition(int tangentLineType)
+    public static TangentLinesDefinition ConvertToTangentLinesDefinition(StabilityParametersUpliftVanTangentLinesDefinition tangentLineType)
     {
-        var translationTable = new Dictionary<int, TangentLinesDefinition>
+        var translationTable = new Dictionary<StabilityParametersUpliftVanTangentLinesDefinition, TangentLinesDefinition>
         {
             {
-                InputTangentLinesOnBoundaryLines, TangentLinesDefinition.OnBoundaryLines
+                StabilityParametersUpliftVanTangentLinesDefinition.OnBoundaryLines, TangentLinesDefinition.OnBoundaryLines
             },
             {
-                InputTangentLinesSpecified, TangentLinesDefinition.Specified
+                StabilityParametersUpliftVanTangentLinesDefinition.Specified, TangentLinesDefinition.Specified
             },
             {
-                InputTangentLinesAutomatic, TangentLinesDefinition.Automatic
+                StabilityParametersUpliftVanTangentLinesDefinition.Automatic, TangentLinesDefinition.Automatic
             }
         };
         return translationTable[tangentLineType];