Index: dam engine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs	(.../GeometryData.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryData.cs	(.../GeometryData.cs)	(revision 337)
@@ -48,15 +48,6 @@
 
         private bool updatingSurfaceLine;
 
-        #region Repairer Id's and property names
-
-        private const string sameStartAndEndPointRepairerId = "Same start and end point";
-        private const string sameStartAndEndPointRepairerPropertyName = "Points";
-        private const string noSoilRepairerId = "No Soil";
-        private const string noSoilRepairerPropertyName = "None";
-
-        #endregion
-
         #region properties
 
         /// <summary>
@@ -542,8 +533,7 @@
                                     validationList.Add(new ValidationResult(ValidationResultType.Error,
                                                                             point + " and " +
                                                                             point1 + " values are same.",
-                                                                            point1, sameStartAndEndPointRepairerPropertyName,
-                                                                            sameStartAndEndPointRepairerId));
+                                                                            point1));
                                 }
                             }
                         }
@@ -553,7 +543,7 @@
             if (Surfaces.Count < 1)
             {
                 validationList.Add(new ValidationResult(ValidationResultType.Error, "No soil surface available.",
-                                                        this, noSoilRepairerPropertyName, noSoilRepairerId));
+                                                        this));
             }
             return validationList.ToArray();
         }
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs	(.../Dike.cs)	(revision 337)
@@ -102,7 +102,7 @@
         {
             foreach (Location location in this.Locations)
             {
-                foreach (Scenario scenario in location.Scenarios)
+                foreach (DesignScenario scenario in location.Scenarios)
                 {
                     scenario.Location = location;
                 }
@@ -183,11 +183,11 @@
 
         public bool UsesGauges { get { return this.GaugePLLines != null && this.GaugePLLines.Count > 0 && this.Gauges != null; } }
 
-        public virtual List<Scenario> Scenarios
+        public virtual List<DesignScenario> Scenarios
         {
             get
             {
-                var scenarios = new List<Scenario>();
+                var scenarios = new List<DesignScenario>();
                 foreach (Location location in Locations)
                 {
                     scenarios.AddRange(location.Scenarios);
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/MStabProject.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/MStabProject.cs	(.../MStabProject.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/MStabProject.cs	(.../MStabProject.cs)	(revision 337)
@@ -369,25 +369,7 @@
 //            UndoRedoManager.Instance.EndAction();
 //        }
 //
-//        #region IVisibleEnabled Members
 //
-//        public override bool IsVisible(string property)
-//        {
-//            switch (property)
-//            {
-//                case "RestProfile":
-//                case "SafeProfile":
-//                case "SlidingCurve":
-//                    return SlidingData != null;
-//                case "MinimumSafetySlices":
-//                    return SlidingData != null && SlidingData.CurrentZone != null && MinimumSafetyCurve != null;
-//                default:
-//                    return base.IsVisible(property);
-//            }
-//        }
-//
-//        #endregion
-//
 //        public MStabProject Clone()
 //        {
 //            MStabProject clone = default(MStabProject);
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 337)
@@ -20,11 +20,9 @@
 // All rights reserved.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Xml.Serialization;
 using Deltares.DamEngine.Data.Design;
@@ -34,7 +32,6 @@
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Probabilistic;
-using Deltares.DamEngine.Data.Standard;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Validation;
 
@@ -153,7 +150,7 @@
         private const double newDikeSlopeOutsideMinValue = 0.01;
         private const double penetrationLenghtMinValue = 0.00;
         private static DamProjectType damProjectType = DamProjectType.Calamity;
-        private readonly List<Scenario> scenarios = new List<Scenario>();
+        private readonly List<DesignScenario> scenarios = new List<DesignScenario>();
         private bool areLocalXZObjectsCreated = false;
         private double boezemLevelHbp = BoezemLevelNotSetValue;
         private double boezemLevelLbp = BoezemLevelNotSetValue;
@@ -1152,7 +1149,7 @@
         }
 
         [Validate]
-        public List<Scenario> Scenarios
+        public List<DesignScenario> Scenarios
         {
             get
             {
@@ -2907,94 +2904,6 @@
                 sb.Append(String.Format(" with {0})", this.SurfaceLine.Name));
             sb.Append(String.Format(" | X={0}, Y={1}, PolderLevel={2:F2}, HeadPL2={3:F2}, HeadPl3={4:F2}", this.XRd, this.YRd, this.PolderLevel, this.HeadPL2, this.HeadPl3));
             return sb.ToString();*/
-        }
-
-        public ICollection GetDomain(string property)
-        {
-            switch (property)
-            {
-                case "PLLineCreationMethod": // ToDo Moet dit nog afhankelijk van damProjectType (design/calamity etc) o.i.d. ? --->> Erik
-                    if (DamProjectType == DamProjectType.DamLiveConfiguration)
-                    {
-                        return new[]
-                        {
-                            PLLineCreationMethod.ExpertKnowledgeRRD,
-                            PLLineCreationMethod.ExpertKnowledgeLinearInDike,
-                            PLLineCreationMethod.DupuitStatic
-                        };
-                    }
-                    else
-                    {
-                        return new[]
-                        {
-                            PLLineCreationMethod.ExpertKnowledgeRRD,
-                            PLLineCreationMethod.ExpertKnowledgeLinearInDike,
-                        };
-                    }
-                case "IntrusionVerticalWaterPressure":
-                    return new[]
-                    {
-                        this.Translate("Standard"),
-                        this.Translate("Linear"),
-                        this.Translate("FullHydroStatic"),
-                        this.Translate("HydroStatic"),
-                        this.Translate("SemiTimeDependent")
-                    };
-                default:
-                    return null;
-            }
-        }
-
-        public void Repair(object subject, string property, string id)
-        {
-            if (subject is Location)
-            {
-                if (id == "ZoneTypeSafety" && property == "StabilityZoneType")
-                {
-                    modelFactors.RequiredSafetyFactorStabilityInnerSlope = detrimentFactor;
-                }
-                if (id == "AssignMinValue" && property == "NewDikeTopWidth")
-                {
-                    NewDikeTopWidth = newDikeTopWidthMinValue;
-                }
-                if (id == "AssignMinValue" && property == "NewDikeSlopeInside")
-                {
-                    NewDikeSlopeInside = newDikeSlopeInsideMinValue;
-                }
-                if (id == "AssignMinValue" && property == "NewDikeSlopeOutside")
-                {
-                    NewDikeSlopeOutside = newDikeSlopeOutsideMinValue;
-                }
-                if (id == "AssignMinValue" && property == "PlLineOffsetFactorBelowShoulderCrest")
-                {
-                    PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMinValue;
-                }
-                if (id == "AssignMaxValue" && property == "PlLineOffsetFactorBelowShoulderCrest")
-                {
-                    PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue;
-                }
-                if (id == "AssignMinValue" && property == "PenetrationLength")
-                {
-                    PenetrationLength = penetrationLenghtMinValue;
-                }
-            }
-        }
-
-        public string GetRepairDescription(object subject, string property, string id)
-        {
-            if (id == "ZoneTypeSafety" && property == "StabilityZoneType")
-            {
-                return LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesRepair");
-            }
-            if (id == "AssignMinValue")
-            {
-                return LocalizationManager.GetTranslatedText(this, "AssignMinValue");
-            }
-            if (id == "AssignMaxValue")
-            {
-                return LocalizationManager.GetTranslatedText(this, "AssignMaxValue");
-            }
-            return "";
-        }        
+        }                
     }
 }
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 337)
@@ -153,7 +153,7 @@
                         {
                             if (damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Count > 0)
                             {
-                                List<Scenario> scenarios = CreateScenarioListForCalculation();
+                                List<DesignScenario> scenarios = CreateScenarioListForCalculation();
                                 var damProjectCalculator = new DamProjectCalculator(damProjectData)
                                 {
                                     MaxCalculationCores = MaxCalculationCores, 
@@ -214,9 +214,9 @@
         /// Create a list of scenarios to be calculated
         /// </summary>
         /// <returns>List of the generated scenarios</returns>
-        private List<Scenario> CreateScenarioListForCalculation()
+        private List<DesignScenario> CreateScenarioListForCalculation()
         {
-            var scenarios = new List<Scenario>(); 
+            var scenarios = new List<DesignScenario>(); 
 
             // The locations of the scenarios can get out of sync after a calculation, so make sure they are in sync
             damProjectData.WaterBoard.UpdateLocationsForScenarios();
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 337)
@@ -39,6 +39,7 @@
 using Deltares.DamEngine.Calculators.General;
 using Deltares.DamEngine.Calculators.PlLinesCreator;
 using Deltares.DamEngine.Calculators.Stability;
+using Deltares.DamEngine.Data.General.Results;
 using Parallel = Deltares.DamEngine.Calculators.General.Parallel;
 
 namespace Deltares.DamEngine.Calculators
@@ -149,7 +150,7 @@
         /// <summary>
         /// Perform the calculations
         /// </summary>
-        public List<List<CsvExportData>> Calculate(DamProjectData damProjectData, IList<Scenario> scenarios)
+        public List<List<CsvExportData>> Calculate(DamProjectData damProjectData, IList<DesignScenario> scenarios)
         {
             foreach (var scenario in scenarios)
             {
@@ -226,7 +227,7 @@
         /// <param name="scenarioTask"></param>
         private void RunScenario(object scenarioTask)
         {
-            var scenario = (Scenario) scenarioTask;
+            var scenario = (DesignScenario) scenarioTask;
             var scenarioName = scenario.Location.Name;
             Debug.WriteLine(String.Format("Start thread for location '{0}'", scenarioName));
             
@@ -335,7 +336,7 @@
             }
         }
 
-        private void CloneLocationOnScenario(Scenario scenario)
+        private void CloneLocationOnScenario(DesignScenario scenario)
         {
             lock (lockObject)
             {
@@ -353,7 +354,7 @@
         /// <param name="calculationSpecification">The calculation specification.</param>
         /// <param name="probabilisticType">Type of the probabilistic.</param>
         /// <param name="analysisType">Type of the analysis.</param>
-        private void CalculateStabilityBishopUpliftvanForScenario(Scenario scenario, DamFailureMechanismeCalculationSpecification calculationSpecification, ProbabilisticType probabilisticType, AnalysisType analysisType)
+        private void CalculateStabilityBishopUpliftvanForScenario(DesignScenario scenario, DamFailureMechanismeCalculationSpecification calculationSpecification, ProbabilisticType probabilisticType, AnalysisType analysisType)
         {
             var bishopCalculationSpecification = new DamFailureMechanismeCalculationSpecification();
             bishopCalculationSpecification.Assign(calculationSpecification);
@@ -385,7 +386,7 @@
         /// <param name="probabilisticType">Type of the probabilistic.</param>
         /// <param name="analysisType">Type of the analysis.</param>
         private void CalculateOneCalculationTypeForScenario(
-            Scenario scenario,
+            DesignScenario scenario,
             DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification,
             ProbabilisticType probabilisticType,
             AnalysisType analysisType)
@@ -564,7 +565,7 @@
         /// <param name="scenario"></param>
         /// <param name="scenario"></param>
         /// <param name="stabilityKernelType"></param>
-        private bool DetermineStabilityUpliftForScenarios(Scenario scenario, StabilityKernelType stabilityKernelType)
+        private bool DetermineStabilityUpliftForScenarios(DesignScenario scenario, StabilityKernelType stabilityKernelType)
         {
             if (stabilityKernelType == StabilityKernelType.AdvancedWti ||
                 stabilityKernelType == StabilityKernelType.AdvancedDotNet)
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Context.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Context.cs	(.../Context.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/Context.cs	(.../Context.cs)	(revision 337)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections;
 
 namespace Deltares.DamEngine.Calculators.General
 {
@@ -47,26 +46,6 @@
             }
         }
 
-        public static bool? IsVisible(object source, string member)
-        {
-            bool? visibility = null;
-            if (currentContext != null)
-            {
-                visibility = currentContext.IsVisible(source, member);
-            }
-            return visibility;
-        }
-
-        public static bool? IsEnabled(object source, string member)
-        {
-            bool? enabled = null;
-            if (currentContext != null)
-            {
-                enabled = currentContext.IsEnabled(source, member);
-            }
-            return enabled;
-        }
-
         public static bool ShouldValidate(object source, string member, bool defaultValidate)
         {
             if (currentContext == null)
@@ -78,27 +57,6 @@
             return validate.HasValue ? validate.Value : defaultValidate;
         }
 
-        public static ICollection GetDomain(object source, string member, ICollection defaultDomain)
-        {
-            if (currentContext == null)
-            {
-                return defaultDomain;
-            }
-
-            ICollection domain = currentContext.GetDomain(source, member);
-            return domain ?? defaultDomain;
-        }
-
-        public static object GetFormat(Type type, object source, string property)
-        {
-            return currentContext != null ? currentContext.GetFormat(type, source, property) : null;
-        }
-
-        public static int[] GetPropertyOrder(Type type, string property)
-        {
-            return currentContext != null ? currentContext.GetPropertyOrder(type, property) : null;
-        }
-
         public static double? GetMinimum(object source, string property)
         {
             return currentContext != null ? currentContext.GetMinimum(source, property) : null;
Index: dam engine/trunk/src/Deltares.DamEngine.Data/Design/Scenario.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/Design/Scenario.cs	(.../Scenario.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Design/Scenario.cs	(.../DesignScenario.cs)	(revision 337)
@@ -61,32 +61,32 @@
     /// <summary>
     /// Calculation scenario class
     /// </summary>
-    public class Scenario
+    public class DesignScenario
     {
         #region Performance optimization: Extract expression so it only has to be generated once.
 
-        private static readonly Expression<Func<Scenario, object>> ExpressionLocationScenarioId = x => x.LocationScenarioID;
-        private static readonly Expression<Func<Scenario, object>> ExpressionRiverLevel = x => x.RiverLevel;
-        private static readonly Expression<Func<Scenario, object>> ExpressionRiverLevelLow = x => x.RiverLevelLow;
-        private static readonly Expression<Func<Scenario, object>> ExpressionDikeTableHeight = x => x.DikeTableHeight;
-        private static readonly Expression<Func<Scenario, object>> ExpressionRequiredSafetyFactorStabilityInnerSlope = x => x.RequiredSafetyFactorStabilityInnerSlope;
-        private static readonly Expression<Func<Scenario, object>> ExpressionRequiredSafetyFactorStabilityOuterSlope = x => x.RequiredSafetyFactorStabilityOuterSlope;
-        private static readonly Expression<Func<Scenario, object>> ExpressionRequiredSafetyFactorPiping = x => x.RequiredSafetyFactorPiping;
-        private static readonly Expression<Func<Scenario, object>> ExpressionRequiredProbabilityOfFailurePiping = x => x.RequiredProbabilityOfFailurePiping;
-        private static readonly Expression<Func<Scenario, object>> ExpressionUpliftCriterionPiping = x => x.UpliftCriterionPiping;
-        private static readonly Expression<Func<Scenario, object>> ExpressionUpliftCriterionStability = x => x.UpliftCriterionStability;
-        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeTopAtRiver = x => x.PlLineOffsetBelowDikeTopAtRiver;
-        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeTopAtPolder = x => x.PlLineOffsetBelowDikeTopAtPolder;
-        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowShoulderBaseInside = x => x.PlLineOffsetBelowShoulderBaseInside;
-        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeToeAtPolder = x => x.PlLineOffsetBelowDikeToeAtPolder;
-        private static readonly Expression<Func<Scenario, object>> ExpressionUsePlLineOffsetBelowDikeCrestMiddle = x => x.UsePlLineOffsetBelowDikeCrestMiddle;
-        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetBelowDikeCrestMiddle = x => x.PlLineOffsetBelowDikeCrestMiddle;
-        private static readonly Expression<Func<Scenario, object>> ExpressionUsePlLineOffsetFactorBelowShoulderCrest = x => x.UsePlLineOffsetFactorBelowShoulderCrest;
-        private static readonly Expression<Func<Scenario, object>> ExpressionPlLineOffsetFactorBelowShoulderCrest = x => x.PlLineOffsetFactorBelowShoulderCrest;
-        private static readonly Expression<Func<Scenario, object>> ExpressionHeadPl3 = x => x.HeadPl3;
-        private static readonly Expression<Func<Scenario, object>> ExpressionHeadPl4 = x => x.HeadPl4;
-        private static readonly Expression<Func<Scenario, object>> ExpressionWaterHeightDecimeringsHoogte = x => x.WaterHeightDecimeringsHoogte;
-        private static readonly Expression<Func<Scenario, object>> ExpressionMaxWaterLevel = x => x.MaxWaterLevel;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionLocationScenarioId = x => x.LocationScenarioID;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionRiverLevel = x => x.RiverLevel;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionRiverLevelLow = x => x.RiverLevelLow;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionDikeTableHeight = x => x.DikeTableHeight;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionRequiredSafetyFactorStabilityInnerSlope = x => x.RequiredSafetyFactorStabilityInnerSlope;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionRequiredSafetyFactorStabilityOuterSlope = x => x.RequiredSafetyFactorStabilityOuterSlope;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionRequiredSafetyFactorPiping = x => x.RequiredSafetyFactorPiping;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionRequiredProbabilityOfFailurePiping = x => x.RequiredProbabilityOfFailurePiping;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionUpliftCriterionPiping = x => x.UpliftCriterionPiping;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionUpliftCriterionStability = x => x.UpliftCriterionStability;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeTopAtRiver = x => x.PlLineOffsetBelowDikeTopAtRiver;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeTopAtPolder = x => x.PlLineOffsetBelowDikeTopAtPolder;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowShoulderBaseInside = x => x.PlLineOffsetBelowShoulderBaseInside;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeToeAtPolder = x => x.PlLineOffsetBelowDikeToeAtPolder;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionUsePlLineOffsetBelowDikeCrestMiddle = x => x.UsePlLineOffsetBelowDikeCrestMiddle;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetBelowDikeCrestMiddle = x => x.PlLineOffsetBelowDikeCrestMiddle;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionUsePlLineOffsetFactorBelowShoulderCrest = x => x.UsePlLineOffsetFactorBelowShoulderCrest;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionPlLineOffsetFactorBelowShoulderCrest = x => x.PlLineOffsetFactorBelowShoulderCrest;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionHeadPl3 = x => x.HeadPl3;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionHeadPl4 = x => x.HeadPl4;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionWaterHeightDecimeringsHoogte = x => x.WaterHeightDecimeringsHoogte;
+        private static readonly Expression<Func<DesignScenario, object>> ExpressionMaxWaterLevel = x => x.MaxWaterLevel;
         
         #endregion
 
@@ -138,7 +138,7 @@
         /// <summary>
         /// Constructor
         /// </summary>
-        public Scenario()
+        public DesignScenario()
         {
             ClearResults();
             ClearErrors();
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs	(.../StabilityCalculator.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs	(.../StabilityCalculator.cs)	(revision 337)
@@ -222,7 +222,7 @@
         /// <param name="scenario"></param>
         /// <param name="soilProfile"></param>
         /// <param name="soilGeometry2DName"></param>
-        public void ConsistencyCheck(Scenario scenario, SoilProfile1D soilProfile, string soilGeometry2DName)
+        public void ConsistencyCheck(DesignScenario scenario, SoilProfile1D soilProfile, string soilGeometry2DName)
         {
             if (soilProfile != null)
             {
@@ -920,7 +920,7 @@
             }
         }
 
-        private void CreateForbiddenZone(Scenario scenario, SurfaceLine2 surfaceLine)
+        private void CreateForbiddenZone(DesignScenario scenario, SurfaceLine2 surfaceLine)
         {
             var dikeTopAtPolder = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder);
             // Zonestype is ForbiddenZone; TODO: Combine with code in StabilityCalculator?
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 337)
@@ -39,6 +39,7 @@
     public class DamProjectData
     {
         public readonly double MissValStabilitySafetyFactor = -1.0;
+        // ##Bka Waterboard eruit werken en vanaf nu max 1 dike!
         private WaterBoard waterBoard;
         private DamProjectCalculationSpecification damProjectCalculationSpecification;
         private WaterBoardJob waterBoardJob = null;
@@ -174,7 +175,7 @@
             foreach (LocationJob locationJob in this.LocationJobs)
             {
                 locationJob.LocationResult = new LocationResult();
-                foreach (Scenario scenario in locationJob.Location.Scenarios)
+                foreach (DesignScenario scenario in locationJob.Location.Scenarios)
                 {
                     scenario.CalculationResults.Clear();
                 }
@@ -200,9 +201,9 @@
             }
         }
 
-        private List<Scenario> CreateScenarioListForDeletion()
+        private List<DesignScenario> CreateScenarioListForDeletion()
         {
-            List<Scenario> scenarios = new List<Scenario>(); ;
+            List<DesignScenario> scenarios = new List<DesignScenario>(); ;
 
             List<Location> locations = this.LocationJobs.Select(x => x.Location).ToList();
             foreach (Location location in locations)
@@ -216,9 +217,9 @@
             return scenarios;
         }
 
-        private List<Scenario> CreateScenarioListForCalculation()
+        private List<DesignScenario> CreateScenarioListForCalculation()
         {
-            List<Scenario> scenarios = new List<Scenario>(); ;
+            List<DesignScenario> scenarios = new List<DesignScenario>(); ;
 
             List<Location> locations = this.SelectedLocationJobs.Select(x => x.Location).ToList();
             foreach (Location location in locations)
@@ -246,7 +247,7 @@
                 designCalculations.Clear();    
             }
 			var scenarios = CreateScenarioListForCalculation();
-            foreach (Scenario scenario in scenarios)
+            foreach (DesignScenario scenario in scenarios)
             {
                 if (scenario.CalculationResults != null && scenario.CalculationResults.Count > 0)
                 {
@@ -523,7 +524,7 @@
 
             // Delete calculationresults in scenarios
             var scenarios = CreateScenarioListForDeletion();
-            foreach (Scenario scenario in scenarios)
+            foreach (DesignScenario scenario in scenarios)
             {
                 scenario.ClearResults();
                 scenario.ClearErrors();
Index: dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 337)
@@ -60,8 +60,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Design\CsvExportData.cs" />
-    <Compile Include="Design\Scenario.cs" />
+    <Compile Include="General\Results\CsvExportData.cs" />
+    <Compile Include="Design\DesignScenario.cs" />
     <Compile Include="General\CompositeJob.cs" />
     <Compile Include="General\DAMEnumerations.cs" />
     <Compile Include="General\DamFailureMechanismeCalculationSpecification.cs" />
Fisheye: Tag 337 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Data/Design/Scenario.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 337 refers to a dead (removed) revision in file `dam engine/trunk/src/Deltares.DamEngine.Data/Design/CsvExportData.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs	(.../DAMFailureMechanismeCalculator.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculator.cs	(.../DAMFailureMechanismeCalculator.cs)	(revision 337)
@@ -105,7 +105,7 @@
         /// </summary>
         /// <param name="analysisTypeGiven"></param>
         /// <param name="scenario"></param>
-        public void Calculate(AnalysisType analysisTypeGiven, Scenario scenario)
+        public void Calculate(AnalysisType analysisTypeGiven, DesignScenario scenario)
         {
             Debug.WriteLine("Location '{0}', scenario '{1}' DamFailureMechanismeCalculator.Calculation", scenario.Location.Name, scenario.LocationScenarioID);
             analysisType = analysisTypeGiven;
@@ -154,7 +154,7 @@
         /// <param name="scenario">The scenario.</param>
         /// <param name="surfaceLine">The surface line.</param>
         /// <returns></returns>
-        public static SurfaceLine2 RedesignSurfaceLineHeight(FailureMechanismSystemType failureMechanismSystemType, Scenario scenario, SurfaceLine2 surfaceLine)
+        public static SurfaceLine2 RedesignSurfaceLineHeight(FailureMechanismSystemType failureMechanismSystemType, DesignScenario scenario, SurfaceLine2 surfaceLine)
         {
             double? dikeHeight = surfaceLine.GetDikeHeight();
             if (dikeHeight.HasValue)
@@ -198,7 +198,7 @@
             }
         }
 
-        private void CalculateForScenario(Scenario scenario)
+        private void CalculateForScenario(DesignScenario scenario)
         {
 //            switch (damFailureMechanismeCalculationSpecification.FailureMechanismSystemType)
 //            {
@@ -672,12 +672,12 @@
         /// Consistency check to be performed before stability calculation
         /// </summary>
         /// <param name="scenarios"></param>
-        private void ConsistencyCheckStability(Scenario scenario)
+        private void ConsistencyCheckStability(DesignScenario scenario)
         {
             ConsistencyCheckStabilityPerScenario(scenario);
         }
 
-        private void ConsistencyCheckStabilityPerScenario(Scenario scenario)
+        private void ConsistencyCheckStabilityPerScenario(DesignScenario scenario)
         {
             // If outward stability calculation then low waterlevel is required
             if (damFailureMechanismeCalculationSpecification.FailureMechanismeParamatersMStab.MStabParameters.GridPosition == MStabGridPosition.Left)
@@ -844,7 +844,7 @@
         /// 
         /// </summary>
         /// <param name="scenarios"></param>
-        private void ImplementNWOInSurfaceLinesForAllScenarios(Scenario scenario)
+        private void ImplementNWOInSurfaceLinesForAllScenarios(DesignScenario scenario)
         {
 //            try
 //            {
@@ -971,7 +971,7 @@
         /// 
         /// </summary>
         /// <param name="scenario"></param>
-        private void RedesignSurfaceLinesForAllScenarios(Scenario scenario)
+        private void RedesignSurfaceLinesForAllScenarios(DesignScenario scenario)
         {
 //            try
 //            {
@@ -1911,7 +1911,7 @@
         /// <param name="scenario">The scenario.</param>
         /// <param name="safetyFactor">The safety factor.</param>
         /// <param name="surfaceLine">The surface line.</param>
-        private void RedesignSurfaceLineFlowSlide(Scenario scenario, double? safetyFactor, ref SurfaceLine2 surfaceLine)
+        private void RedesignSurfaceLineFlowSlide(DesignScenario scenario, double? safetyFactor, ref SurfaceLine2 surfaceLine)
         {
             throw new DamFailureMechanismeCalculatorException("Geometry adaption not supported for Flowslide");
         }
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculatorException.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculatorException.cs	(.../DAMFailureMechanismeCalculatorException.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DAMFailureMechanismeCalculatorException.cs	(.../DAMFailureMechanismeCalculatorException.cs)	(revision 337)
@@ -47,6 +47,6 @@
         {
         }
 
-        public Scenario Scenario { get; set; }
+        public DesignScenario Scenario { get; set; }
     }
 }
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/CsvExportData.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/CsvExportData.cs	(.../Design/CsvExportData.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Results/CsvExportData.cs	(.../General/Results/CsvExportData.cs)	(revision 337)
@@ -25,13 +25,12 @@
 using System.Diagnostics;
 using System.IO;
 using System.Xml.Serialization;
-using Deltares.DamEngine.Data.General;
-using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
 
-namespace Deltares.DamEngine.Data.Design
+namespace Deltares.DamEngine.Data.General.Results
 {
     /// <summary>
     ///1:"Id":invoer
@@ -60,7 +59,7 @@
         private AnalysisType analysisType;
         private ProbabilisticType probabilisticType;
         private DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification;
-        private Scenario scenario;
+        private DesignScenario scenario;
         private SoilProfile1D soilProfile;
         private string soilGeometry2DName;
         private double? safetyFactorFlowSlide;
@@ -116,7 +115,7 @@
         {
         }
 
-        public CsvExportData(string id, Dike dike, DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification, Scenario scenario, SoilProfile1D soilProfile,
+        public CsvExportData(string id, Dike dike, DamFailureMechanismeCalculationSpecification damFailureMechanismeCalculationSpecification, DesignScenario scenario, SoilProfile1D soilProfile,
             string soilGeometry2DName, AnalysisType analysisType, int nwoResultIndex, ProbabilisticType probabilisticType)
         {
             this.id = id;
@@ -1281,7 +1280,7 @@
             set { this.safetyFactorFlowSlide = value; }
         }
 
-        public Scenario Scenario
+        public DesignScenario Scenario
         {
             get { return scenario; }
             set { scenario = value; }
Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 337)
@@ -202,7 +202,7 @@
         {
             if (this.HasScenarioResults)
             {
-                Scenario scenario = Location.Scenarios[0]; 
+                DesignScenario scenario = Location.Scenarios[0]; 
                 if (scenario != null && scenario.CalculationResults.Count > 0)
                 {
                     return scenario.CalculationResults[0];
@@ -286,7 +286,7 @@
         {
             get
             {
-                List<Scenario> scenarios = Location.Scenarios;
+                List<DesignScenario> scenarios = Location.Scenarios;
                 foreach (var scenario in scenarios)
                 {
                     foreach (var calculationResult in scenario.CalculationResults)
@@ -318,7 +318,7 @@
         private double GetLowestRealSafetyFactorFromScenarios()
         {
             var res = double.MaxValue;
-            List<Scenario> scenarios = Location.Scenarios;
+            List<DesignScenario> scenarios = Location.Scenarios;
             foreach (var scenario in scenarios)
             {
                 foreach (var calculationResult in scenario.CalculationResults)
@@ -351,7 +351,7 @@
         private double GetHighestRealPropbabilityFromScenarios()
         {
             var res = double.MinValue;
-            List<Scenario> scenarios = Location.Scenarios;
+            List<DesignScenario> scenarios = Location.Scenarios;
             foreach (var scenario in scenarios)
             {
                 foreach (var calculationResult in scenario.CalculationResults)
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs	(.../DamProjectCalculatorCsvExportDataBuilder.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculatorCsvExportDataBuilder.cs	(.../DamProjectCalculatorCsvExportDataBuilder.cs)	(revision 337)
@@ -22,6 +22,7 @@
 using System.Text;
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Results;
 
 namespace Deltares.DamEngine.Calculators.General
 {
@@ -32,7 +33,7 @@
     internal class DamProjectCalculatorCsvExportDataBuilder
     {
         private Dike Dike { get; set; }
-        private Scenario Scenario { get; set; }
+        private DesignScenario Scenario { get; set; }
         private DamFailureMechanismeCalculationSpecification FailureMechanismSystemType { get; set; }
         private AnalysisType AnalysisType { get; set; }
         private ProbabilisticType ProbabilisticType { get; set; }
@@ -47,7 +48,7 @@
         /// <param name="damFailureMechanismCalculationSpecification">The <see cref="DamFailureMechanismeCalculationSpecification"/> for which to create <see cref="CsvExportData"/>.</param>
         /// <param name="analysisType">The <see cref="AnalysisType"/> for which to create <see cref="CsvExportData"/>.</param>
         /// <param name="probabilisticType">The <see cref="ProbabilisticType"/> for which to create <see cref="CsvExportData"/></param>
-        public DamProjectCalculatorCsvExportDataBuilder(Dike dike, Scenario scenario, DamFailureMechanismeCalculationSpecification damFailureMechanismCalculationSpecification, AnalysisType analysisType, ProbabilisticType probabilisticType)
+        public DamProjectCalculatorCsvExportDataBuilder(Dike dike, DesignScenario scenario, DamFailureMechanismeCalculationSpecification damFailureMechanismCalculationSpecification, AnalysisType analysisType, ProbabilisticType probabilisticType)
         {
             Dike = dike;
             Scenario = scenario;
Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/IContext.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/IContext.cs	(.../IContext.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/IContext.cs	(.../IContext.cs)	(revision 337)
@@ -25,36 +25,11 @@
 namespace Deltares.DamEngine.Calculators.General
 {
     /// <summary>
-    /// Application context class, which governs application wide overrides for visibility,
-    /// enabledness or domain data collections.
+    /// Application context class, which governs application wide overrides for min/max values and validation
     /// </summary>
     public interface IContext
     {
         /// <summary>
-        /// Method indicating a visibility override value for a given instance object.
-        /// </summary>
-        /// <param name="source">Object being evaluated.</param>
-        /// <param name="member">Name of the member which is part of <paramref name="source"/>.</param>
-        /// <returns>True if visible; False if hidden; Null if no override.</returns>
-        bool? IsVisible(object source, string member);
-
-        /// <summary>
-        /// Method indicating if the enabled override value for a given instance object.
-        /// </summary>
-        /// <param name="source">Object being evaluated.</param>
-        /// <param name="member">Name of the member which is part of <paramref name="source"/>.</param>
-        /// <returns>True if enabled; False if disabled; Null if no override.</returns>
-        bool? IsEnabled(object source, string member);
-
-        /// <summary>
-        /// Method returning a collection of domain object for list or enum type members;
-        /// </summary>
-        /// <param name="source">Object being evaluated.</param>
-        /// <param name="member">Name of the member which is part of <paramref name="source"/>.</param>
-        /// <returns>A collection of domain object; Null if no override.</returns>
-        ICollection GetDomain(object source, string member);
-
-        /// <summary>
         /// Indicates to <see cref="Validator"/> whether to perform the validation on the property or the method
         /// </summary>
         /// <param name="source">Object being evaluated.</param>
@@ -79,30 +54,12 @@
         double? GetMaximum(object source, string member);
 
         /// <summary>
-        /// Gets the format string for a member.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <param name="source">The source.</param>
-        /// <param name="member">The member.</param>
-        /// <returns></returns>
-        string GetFormat(Type type, object source, string member);
-
-        /// <summary>
         /// Gets the default value for a memner.
         /// </summary>
         /// <param name="type">The type.</param>
         /// <param name="member">The member.</param>
         /// <returns></returns>
         object GetDefault(Type type, string member);
-        // waar is dit het handigst te implementeren (qua gebruik van)?
-
-        /// <summary>
-        /// Gets the property order for UI display purposes.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <param name="member">The member.</param>
-        /// <returns></returns>
-        int[] GetPropertyOrder(Type type, string member);
-        // is dit handig? Zo ja, dan ook een idee voor de andere attr?
+        // waar is dit het handigst te implementeren (qua gebruik van)?        
     }
 }
\ No newline at end of file