Fisheye: Tag 2100 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/JobResultInterpreter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs
===================================================================
diff -u -r2032 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamFailureMechanismeCalculationSpecification.cs	(.../DamFailureMechanismeCalculationSpecification.cs)	(revision 2100)
@@ -20,12 +20,42 @@
 // All rights reserved.
 
 using System;
-using Deltares.DamEngine.Data.General.Sensors;
-using Deltares.DamEngine.Data.Standard.Validation;
 
 namespace Deltares.DamEngine.Data.General
 {
+
     /// <summary>
+    /// Types of (calculation) models for Stability. 
+    /// </summary>
+    public enum MStabModelType
+    {
+        Bishop,
+        Spencer,
+        Fellenius,
+        UpliftVan,
+        UpliftSpencer,
+        BishopRandomField,
+        HorizontalBalance,
+        BishopUpliftVan,
+        SpencerHigh,   // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed.
+        SpencerLow,
+        BishopWti,     // #Bka: for now, only UpliftVanWti is to be used of all Wti options.
+        UpliftVanWti,
+        UpliftSpencerWti
+    }
+
+    /// <summary>
+    /// Types of (calculation) models for Piping
+    /// </summary>
+    public enum PipingModelType
+    {
+        Bligh,
+        SellmeijerVnk,
+        Sellmeijer4Forces,
+        Wti2017
+    }
+
+    /// <summary>
     /// 
     /// </summary>
     public class DamFailureMechanismeCalculationSpecification
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs
===================================================================
diff -u -r2032 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2100)
@@ -20,6 +20,8 @@
 // All rights reserved.
 
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Sensors;
+using Deltares.DamEngine.Data.General.TimeSeries;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r1974 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 2100)
@@ -32,6 +32,65 @@
 
 namespace Deltares.DamEngine.Data.General
 {
+
+    /// <summary>
+    /// MainType for DAM, determines type of calculations are to be performed
+    /// </summary>
+    public enum DamType
+    {
+        Primary,
+        Regional
+    }
+
+    /// <summary>
+    /// Types of project for DAM
+    /// </summary>
+    public enum DamProjectType
+    {
+        AssessmentRegional,
+        Operational,
+        Design
+    }
+
+    /// <summary>
+    /// Types of analysis for the Design option DAM
+    /// </summary>
+    public enum AnalysisType
+    {
+        NoAdaption,
+        AdaptGeometry
+    };
+
+    /// <summary>
+    /// Types of Failure mechanisms for DAM
+    /// </summary>
+    public enum FailureMechanismSystemType
+    {
+        StabilityInside,
+        StabilityOutside,
+        Piping,
+        HorizontalBalance
+    }
+
+    /// <summary>
+    /// Types of soil profiles for DAM
+    /// </summary>
+    public enum SoilProfileType
+    {
+        ProfileType1D,
+        ProfileType2D,
+        ProfileTypeStiFile
+    }
+
+    /// <summary>
+    /// Types of stability adaption options for the DesignOption for DAM
+    /// </summary>
+    public enum StabilityDesignMethod //Design
+    {
+        OptimizedSlopeAndShoulderAdaption,
+        SlopeAdaptionBeforeShoulderAdaption
+    }
+
     public class Location
     {
         // Added initial value as these properties must be tested for real values on import
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorEnumerations.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorEnumerations.cs	(revision 2100)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2019. 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 <http://www.gnu.org/licenses/>.
+//
+// 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.
+
+namespace Deltares.DamEngine.Data.General.Sensors
+{
+    public enum DataSourceTypeSensors  //Sensors
+    {
+        Ignore,
+        LocationData,
+        Sensor
+    }
+
+    public enum SensorType  //Sensors
+    {
+        PiezometricHead,
+        WaterLevel,
+        PolderLevel
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs
===================================================================
diff -u -r2032 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 2100)
@@ -21,6 +21,8 @@
 
 using System.Collections.Generic;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Sensors;
+using Deltares.DamEngine.Data.General.TimeSeries;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Logging;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r2022 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 2022)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 2100)
@@ -65,13 +65,13 @@
     <Compile Include="General\PlLines\PlLine.cs" />
     <Compile Include="General\PlLines\PlLines.cs" />
     <Compile Include="General\PolyLine.cs" />
-    <Compile Include="General\Results\JobResultInterpreter.cs" />
     <Compile Include="General\Results\LocationResult.cs" />
     <Compile Include="General\Results\PipingDesignResults.cs" />
     <Compile Include="General\Results\PipingResults.cs" />
     <Compile Include="General\Results\StabilityDesignResults.cs" />
     <Compile Include="General\Results\StabilityResultTypes.cs" />
     <Compile Include="General\Segment.cs" />
+    <Compile Include="General\Sensors\SensorEnumerations.cs" />
     <Compile Include="General\Sensors\SensorGroup.cs" />
     <Compile Include="General\Sensors\Sensor.cs" />
     <Compile Include="General\Sensors\SensorData.cs" />
@@ -106,6 +106,7 @@
     <Compile Include="General\TimeSeries\TimeSerie.cs" />
     <Compile Include="General\TimeSeries\TimeSerieCollection.cs" />
     <Compile Include="General\TimeSeries\TimeSerieEntry.cs" />
+    <Compile Include="General\TimeSeries\TimeSerieEnumerations.cs" />
     <Compile Include="General\TimeSeries\TimeStep.cs" />
     <Compile Include="General\UpliftSituation.cs" />
     <Compile Include="Geometry\CoordinateSystemConverter.cs" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs
===================================================================
diff -u -r2032 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 2100)
@@ -21,116 +21,7 @@
 
 namespace Deltares.DamEngine.Data.General
 {
-    public enum DamType
-    {
-        Primary,
-        Regional
-    }
 
-    public enum DamProjectType
-    {
-        AssessmentRegional, 
-        Operational,
-        Design
-    }
-
-    public enum AnalysisType
-    {
-        NoAdaption,
-        AdaptGeometry        
-    };
-
-    public enum FailureMechanismSystemType
-    {
-        StabilityInside,
-        StabilityOutside,
-        Piping,
-        HorizontalBalance
-    }
-
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum MStabModelType
-    {
-        Bishop,
-        Spencer,
-        Fellenius,
-        UpliftVan,
-        UpliftSpencer,
-        BishopRandomField,
-        HorizontalBalance,
-        BishopUpliftVan,
-        SpencerHigh,   // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed.
-        SpencerLow,
-        BishopWti,     // #Bka: for now, only UpliftVanWti is to be used of all Wti options.
-        UpliftVanWti, 
-        UpliftSpencerWti
-    }
-
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum PipingModelType
-    {
-        Bligh,
-        SellmeijerVnk,
-        Sellmeijer4Forces,
-        Wti2017
-    };
-
-    public enum PlLineAssignment
-    {
-        NoPlLines,
-        ExpertKnowledge,
-        DikeFlow,
-        OrginalPlLines
-    }
-
-    public enum SoilProfileType
-    {
-        ProfileType1D,
-        ProfileType2D,
-        ProfileTypeStiFile
-    }
-
-
-
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum MStabShearStrength
-    {
-        CPhi,
-        StressTables,
-        CuCalculated,
-        CuMeasured,
-        CuGradient,
-        Default
-    }
-
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum MStabSearchMethod
-    {
-        Grid,
-        GeneticAlgorithm
-    }
-
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum MStabGridPosition
-    {
-        Left,
-        Right
-    }
-
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum MStabZonesType
-    {
-        NoZones = 0,
-        ZoneAreas = 1,
-        ForbiddenZone = 2
-    }
-
-    public enum StabilityDesignMethod //Design
-    {
-        OptimizedSlopeAndShoulderAdaption,
-        SlopeAdaptionBeforeShoulderAdaption
-    }
-
     public enum PlLineType
     {
         Pl1,
@@ -139,51 +30,35 @@
         Pl4
     }
 
-    public enum PlLinePointPositionXzType
-    {
-        OnPlLine,
-        AbovePlLine,
-        BelowPlLine,
-        BeyondPlLine // indicates that point is outside the scope of the pl line.
-    };
-
-    // TODO: RW this is regional specific code and should be moved to its own class
+    // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated!
     public enum DikeDrySensitivity //RWScenarios
     {
         None,
         Dry
     }
 
-    // TODO: RW this is regional specific code and should be moved to its own class
+    // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated!
     public enum HydraulicShortcutType //RWScenarios
     {
         HydraulicShortcut,
         NoHydraulicShortcut
     }
 
-    // TODO: RW this is regional specific code and should be moved to its own class
+    // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated!
     public enum RegionalResultType //RWScenarios
     {
         ProbabilityOfFailure,
         SafetyFactor
     }
 
-    // TODO: RW this is regional specific code and should be moved to its own class
-    public enum ResultEvaluation //RWScenarios
-    {
-        Accepted,
-        Rejected,
-        NotEvaluated
-    }
-
-    // TODO: RW this is regional specific code and should be moved to its own class
+    // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated!
     public enum LoadSituation //RWScenarios
     {
         Dry,
         Wet
     }
 
-    // TODO: RW this is regional specific code and should be moved to its own class
+    // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated!
     public enum ScenarioType //RWScenarios
     {
         Scenario01 = 1,
@@ -199,47 +74,7 @@
         Scenario11 = 11
     }
 
-    // TODO: RW this is regional specific code and should be moved to its own class
-    public enum SchematizationType //Schematizationfactor
-    {
-        MacroStabilityInnerSideWet,
-        MacroStabilityInnerSideDry,
-        PipingWet,
-        PipingDry,
-        HorizontalBalanceDry
-    }
-
-    // TODO: Operational. This is operational specific code and should be moved to its own class
-    public enum DataSourceTypeSensors  //Sensors
-    {
-        Ignore,
-        LocationData,
-        Sensor
-    }
-
-    // TODO: Operational. This is operational specific code and should be moved to its own class
-    public enum SensorType  //Sensors
-    {
-        PiezometricHead,
-        WaterLevel,
-        PolderLevel
-    }
-
-    // TODO: Operational. This is operational specific code and should be moved to its own class
-    /// <summary>
-    /// Type of output series
-    /// </summary>
-    public enum TimeSerieParameters
-    {
-        PipingFactorWtiSellmeijerRevised,
-        PipingFactorBligh,
-        PipingFactorSellmeijer,
-        ProbabilityOfFailurePipingSellmeijer,
-        OvertoppingErosion,
-        StabilityInsideFactor,
-        StabilityOutsideFactor
-    }
-
+    // TODO: RW this is regional specific code and should be moved to its own class #Bka: so should be eliminated!
     public enum UpliftType
     {
         Uplift,
@@ -255,30 +90,8 @@
         None
     }
 
-    public enum JobResult
-    {
-        NoRun,
-        Failed,
-        Good,
-        Bad,
-        Mixed
-    }
-
-    // TODO: Operational. This is operational specific code and should be moved to its own class
-    public enum TimeStepUnit
-    {
-        Second,
-        Minute,
-        Hour,
-        Day,
-        Week,
-        Month,
-        Year,
-        Nonequidistant
-    }
-
     /// <summary>
-    /// Dike soil scenario for the automatic creation of the waternet - 4 possibilities.
+    /// Dike soil scenario for the automatic creation of the waternet - 4 possibilities. #Bka: is nowhere really used so should be removed entirely.
     /// </summary>
     public enum DikeSoilScenario
     {
@@ -302,15 +115,4 @@
         /// </summary>
         SandDikeOnSand
     }
-
-    // TODO: FM this is failure mechanism specific code and should be moved to ..\KernelWrappers
-    public enum IntrusionVerticalWaterPressureType
-    {
-        Standard,
-        Linear,
-        FullHydroStatic,
-        HydroStatic,
-        SemiTimeDependent
-    }
-
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEnumerations.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEnumerations.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEnumerations.cs	(revision 2100)
@@ -0,0 +1,35 @@
+// Copyright (C) Stichting Deltares 2019. 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 <http://www.gnu.org/licenses/>.
+//
+// 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.
+
+namespace Deltares.DamEngine.Data.General.TimeSeries
+{
+    public enum TimeStepUnit
+    {
+        Second,
+        Minute,
+        Hour,
+        Day,
+        Week,
+        Month,
+        Year,
+        Nonequidistant
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs
===================================================================
diff -u -r1974 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs	(.../MStabParameters.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs	(.../MStabParameters.cs)	(revision 2100)
@@ -37,6 +37,52 @@
         Specified = 1
     }
 
+    public enum IntrusionVerticalWaterPressureType
+    {
+        Standard,
+        Linear,
+        FullHydroStatic,
+        HydroStatic,
+        SemiTimeDependent
+    }
+
+    public enum MStabShearStrength
+    {
+        CPhi,
+        StressTables,
+        CuCalculated,
+        CuMeasured,
+        CuGradient,
+        Default
+    }
+
+    public enum MStabSearchMethod
+    {
+        Grid,
+        GeneticAlgorithm
+    }
+
+    public enum MStabGridPosition
+    {
+        Left,
+        Right
+    }
+
+    public enum MStabZonesType
+    {
+        NoZones = 0,
+        ZoneAreas = 1,
+        ForbiddenZone = 2
+    }
+
+    public enum PlLineAssignment
+    {
+        NoPlLines,
+        ExpertKnowledge,
+        DikeFlow,
+        OrginalPlLines
+    }
+
     public class SheetPiling : IAssignable<SheetPiling>, ICloneable<SheetPiling>
     {
         public double XCoordinate { get; set; }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r2032 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2032)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs	(.../OperationalCalculator.cs)	(revision 2100)
@@ -42,7 +42,22 @@
 
 namespace Deltares.DamEngine.Calculators.DikesOperational
 {
+
     /// <summary>
+    /// Type of output series
+    /// </summary>
+    public enum TimeSerieParameters
+    {
+        PipingFactorWtiSellmeijerRevised,
+        PipingFactorBligh,
+        PipingFactorSellmeijer,
+        ProbabilityOfFailurePipingSellmeijer,
+        OvertoppingErosion,
+        StabilityInsideFactor,
+        StabilityOutsideFactor
+    }
+
+    /// <summary>
     /// Class for the Operational Calculator
     /// </summary>
     public class OperationalCalculator
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PlLine.cs
===================================================================
diff -u -r1974 -r2100
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PlLine.cs	(.../PlLine.cs)	(revision 1974)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/PlLines/PlLine.cs	(.../PlLine.cs)	(revision 2100)
@@ -19,9 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Standard;
 
@@ -67,60 +64,6 @@
             }
             return plLine;
         }
-
-        /// <summary>
-        /// Gets the points in the segment between starting x and ending x
-        /// </summary>
-        /// <remarks>
-        /// </remarks>
-        /// <param name="startX"></param>
-        /// <param name="endX"></param>
-        /// <returns></returns>
-        public IEnumerable<PlLinePoint> GetPointSegmentBetween(double startX, double endX)
-        {
-            if (endX < startX)
-                throw new ArgumentException("End value is smaller then the start value");
-
-            return from point in this.PointsOrderedByX
-                   where point != null && (point.X > startX && point.X < endX)
-                   orderby point.X ascending
-                   select point;
-        }
-
-        /// <summary>
-        /// Determines whether the given point is above, beneath or on the surfaceline.
-        /// </summary>
-        /// <param name="point"></param>
-        /// <returns></returns>
-        public PlLinePointPositionXzType PositionXzOfPointRelatedToPlLine(GeometryPoint point)
-        {
-            // if point is out of scope of the surface line, return beyond
-            if ((point.X < points[0].X) || (point.X > points[points.Count - 1].X))
-                return PlLinePointPositionXzType.BeyondPlLine;
-
-            double z = ZFromX(point.X);
-            if (Math.Abs(point.Z - z) < GeometryPoint.Precision)
-            {
-                return PlLinePointPositionXzType.OnPlLine;
-            }
-            else
-            {
-                if (point.Z > z)
-                {
-                    return PlLinePointPositionXzType.AbovePlLine;
-                }
-                else
-                {
-                    return PlLinePointPositionXzType.BelowPlLine;
-                }
-            }
-        }
-
-        private IEnumerable<PlLinePoint> PointsOrderedByX
-        {
-            get { return this.Points.OrderBy(p => p.X); }
-        }
-
     }
 
 }