Fisheye: Tag 1065 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenarioSelector.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r992 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 992)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 1065)
@@ -25,7 +25,7 @@
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.General.Sensors;
-using Deltares.DamEngine.Data.RWScenarios;
+using Deltares.DamEngine.Data.RegionalAssessmentResults;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Logging;
@@ -45,7 +45,7 @@
         private DamProjectType damProjectType = DamProjectType.Operational;
         private ProgramType programType = ProgramType.MStab;
         private List<LocationJob> jobs = new List<LocationJob>();
-        private List<RWScenarioProfileResult> calculations = null; // will be created and initialized in property
+        private List<RegionalScenarioProfileResult> calculations = null; // will be created and initialized in property
         private List<DesignResult> designCalculations = null;
         private List<RWSchematizationFactorResult> schematizationFactors = null;
         /// <summary>
@@ -165,13 +165,13 @@
             }
         }
         
-        public List<RWScenarioProfileResult> Calculations
+        public List<RegionalScenarioProfileResult> Calculations
         {
             get
             {
                 if (calculations == null)
                 {
-                    calculations = new List<RWScenarioProfileResult>();
+                    calculations = new List<RegionalScenarioProfileResult>();
                     this.UpdateCalculations();
                 }
 
@@ -189,9 +189,9 @@
                 {
                     if (locationJob.HasRWScenarioResults)
                     {
-                        foreach (RWScenarioResult locationResult in locationJob.RWScenarioResults)
+                        foreach (var locationResult in locationJob.RWScenarioResults)
                         {
-                            calculations.AddRange(locationResult.RWScenarioProfileResults);
+                            calculations.AddRange(locationResult.RegionalScenarioProfileResults);
                         }
                     }
                 }                
@@ -335,7 +335,7 @@
         {
             get
             {
-                if (jobs.Count == 0)
+                if (jobs.Count == 0 && dikeJob != null)
                 {
                     foreach (LocationJob locationJob in dikeJob.Jobs)
                     {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenarioSelector.cs
===================================================================
diff -u -r1050 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenarioSelector.cs	(.../RWScenarioSelector.cs)	(revision 1050)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenarioSelector.cs	(.../RegionalScenarioSelector.cs)	(revision 1065)
@@ -25,36 +25,41 @@
 using Deltares.DamEngine.Calculators.RegionalAssessment.Evaluator;
 using Deltares.DamEngine.Calculators.RegionalAssessment.HydraulicShortcut;
 using Deltares.DamEngine.Data.General;
-using Deltares.DamEngine.Data.RWScenarios;
+using Deltares.DamEngine.Data.RegionalAssessmentResults;
 
-namespace Deltares.DamEngine.Calculators.Dikes_Assessment_Regional
+namespace Deltares.DamEngine.Calculators.DikesAssessmentRegional
 {
-    public class RWScenarioSelector
+    /// <summary>
+    /// Class to select all scenarios which have to be assessed in th regional assessment.
+    /// </summary>
+    public class RegionalScenarioSelector
     {
-        public RWScenarioSelector()
-        {
-        }
-
+        /// <summary>
+        /// Gets or sets the type of the piping model.
+        /// </summary>
+        /// <value>
+        /// The type of the piping model.
+        /// </value>
         public PipingModelType PipingModelType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the m stab parameters.
+        /// </summary>
+        /// <value>
+        /// The m stab parameters.
+        /// </value>
         public MStabParameters MStabParameters { get; set; }
 
-        private bool WillChoicesResultInScenarios(params Enum[] previousChoices)
+        /// <summary>
+        /// Gets the scenarios.
+        /// </summary>
+        /// <param name="location">The location.</param>
+        /// <param name="soilGeometryProbability">The soil geometry probability.</param>
+        /// <returns></returns>
+        public RegionalScenarioProfileResult[] GetScenarios(Location location, SoilGeometryProbability soilGeometryProbability)
         {
-            if (previousChoices.Length >= 2)
-            {
-                if (previousChoices[0].Equals(LoadSituation.Dry) && previousChoices[1].Equals(DikeDrySensitivity.None))
-                {
-                    return false;
-                }
-            }
+            List<RegionalScenarioProfileResult> scenarios = new List<RegionalScenarioProfileResult>();
 
-            return true;
-        }
-
-        public RWScenarioProfileResult[] GetScenarios(Location location, SoilGeometryProbability soilGeometryProbability)
-        {
-            List<RWScenarioProfileResult> scenarios = new List<RWScenarioProfileResult>();
-
             Evaluator[] evaluators = new Evaluator[]
                                            {
                                                new DikeMaterialEvaluator(), 
@@ -92,26 +97,26 @@
                             {
                                 if (choices[3].Equals(UpliftType.NoUplift))
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
                                 }
                                 else // UpliftType.Uplift 
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario04, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario04, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
                                 }
                             }
                             else // HydraulicShortcutType.HydraulicShortcut
                             {
                                 if (choices[3].Equals(UpliftType.NoUplift))
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
                                 }
                                 else // UpliftType.Uplift 
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario03, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario03, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
                                 }
                             }
                         }
@@ -121,26 +126,26 @@
                             {
                                 if (choices[3].Equals(UpliftType.NoUplift))
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
                                 }
                                 else // UpliftType.Uplift 
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario04, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario04, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario08, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
                                 }
                             }
                             else // HydraulicShortcutType.HydraulicShortcut
                             {
                                 if (choices[3].Equals(UpliftType.NoUplift))
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
                                 }
                                 else // UpliftType.Uplift 
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario03, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario03, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario07, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario10, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
                                 }
                             }
                         }
@@ -153,28 +158,28 @@
                             {
                                 if (choices[3].Equals(UpliftType.NoUplift))
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario06, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario06, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
                                 }
                                 else // UpliftType.Uplift 
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario02, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario06, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario09, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.HorizontalBalance));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario11, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario02, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario06, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario09, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.HorizontalBalance));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario11, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
                                 }
                             }
                             else // HydraulicShortcutType.HydraulicShortcut
                             {
                                 if (choices[3].Equals(UpliftType.NoUplift))
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario05, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario05, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
                                 }
                                 else // UpliftType.Uplift 
                                 {
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario01, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario05, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario09, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.HorizontalBalance));
-                                    scenarios.Add(this.GetScenario(ScenarioType.Scenario11, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario01, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.UpliftVan));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario05, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.Bishop));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario09, choices, location, soilGeometryProbability, FailureMechanismSystemType.StabilityInside, MStabModelType.HorizontalBalance));
+                                    scenarios.Add(GetScenario(ScenarioType.Scenario11, choices, location, soilGeometryProbability, FailureMechanismSystemType.Piping, PipingModelType));
                                 }
                             }
                         }
@@ -185,19 +190,21 @@
             return scenarios.ToArray();
         }
 
-        private RWScenarioProfileResult GetScenario(ScenarioType scenarioType, Enum[] choices, Location location,
+        private RegionalScenarioProfileResult GetScenario(ScenarioType scenarioType, Enum[] choices, Location location,
             SoilGeometryProbability soilGeometryProbability, FailureMechanismSystemType failureMechanismType, MStabModelType modelOption)
         {
-            RWScenarioProfileResult scenario = new RWScenarioProfileResult(location, soilGeometryProbability); 
-            scenario.FailureMechanismType = failureMechanismType;
-            scenario.MstabModelOption = modelOption;
-            scenario.PipingModelOption = PipingModelType;
-            scenario.LoadSituation = (LoadSituation)choices[0];
-            scenario.DikeDrySensitivity = (DikeDrySensitivity)choices[1];
-            scenario.HydraulicShortcutType = (HydraulicShortcutType)choices[2];
-            scenario.UpliftType = (UpliftType)choices[3];
+            var scenario = new RegionalScenarioProfileResult(location, soilGeometryProbability)
+            {
+                FailureMechanismType = failureMechanismType,
+                MstabModelOption = modelOption,
+                PipingModelOption = PipingModelType,
+                LoadSituation = (LoadSituation) choices[0],
+                DikeDrySensitivity = (DikeDrySensitivity) choices[1],
+                HydraulicShortcutType = (HydraulicShortcutType) choices[2],
+                UpliftType = (UpliftType) choices[3],
+                ScenarioType = scenarioType
+            };
 
-            scenario.ScenarioType = scenarioType;
 
             //if (scenario.IsDry)
             //{
@@ -213,10 +220,10 @@
             return scenario;
         }
 
-        private RWScenarioProfileResult GetScenario(ScenarioType scenarioType, Enum[] choices, Location location,
+        private RegionalScenarioProfileResult GetScenario(ScenarioType scenarioType, Enum[] choices, Location location,
             SoilGeometryProbability soilGeometryProbability, FailureMechanismSystemType failureMechanismType, PipingModelType pipingModelType)
         {
-            RWScenarioProfileResult scenario = new RWScenarioProfileResult(location, soilGeometryProbability)
+            var scenario = new RegionalScenarioProfileResult(location, soilGeometryProbability)
             {
                 FailureMechanismType = failureMechanismType,
                 MstabModelOption = MStabModelType.Bishop,
@@ -243,5 +250,18 @@
 
             return scenario;
         }
+
+        private bool WillChoicesResultInScenarios(params Enum[] previousChoices)
+        {
+            if (previousChoices.Length >= 2)
+            {
+                if (previousChoices[0].Equals(LoadSituation.Dry) && previousChoices[1].Equals(DikeDrySensitivity.None))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj
===================================================================
diff -u -r1055 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 1055)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj	(.../Deltares.DamEngine.Data.csproj)	(revision 1065)
@@ -135,9 +135,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="RWScenarios\EvaluationJob.cs" />
-    <Compile Include="RWScenarios\RWResult.cs" />
-    <Compile Include="RWScenarios\RWScenariosResult.cs" />
+    <Compile Include="RegionalAssessmentResults\EvaluationJob.cs" />
+    <Compile Include="RegionalAssessmentResults\RegionalScenarioProfileResult.cs" />
+    <Compile Include="RegionalAssessmentResults\RegionalResult.cs" />
+    <Compile Include="RegionalAssessmentResults\RegionalScenarioResult.cs" />
+    <Compile Include="RegionalAssessmentResults\RegionalScenariosResult.cs" />
     <Compile Include="Standard\Calculation\Delegates.cs" />
     <Compile Include="Standard\Calculation\ICalculation.cs" />
     <Compile Include="Standard\ComputeDoubles.cs" />
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/EvaluationJob.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/EvaluationJob.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/EvaluationJob.cs	(revision 1065)
@@ -0,0 +1,146 @@
+// Copyright (C) Stichting Deltares 2018. 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.
+
+using System.Collections.Generic;
+using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Standard.Calculation;
+
+namespace Deltares.DamEngine.Data.RegionalAssessmentResults
+{
+    public class EvaluationJob
+    {
+        private string dikeName = "";
+        private List<Location> locations = new List<Location>();
+        private List<Location> failedEvaluatedLocations = new List<Location>();
+        private List<RegionalScenariosResult> results = new List<RegionalScenariosResult>();
+        private List<RWSchematizationFactorsResult> schematizationFactorResults = new List<RWSchematizationFactorsResult>();
+
+        public string DikeName
+        {
+            get { return dikeName; }
+            set { dikeName = value; }
+        }
+
+        public List<Location> Locations
+        {
+            get { return locations; }
+            set { locations = value; }
+        }
+
+        public List<RegionalScenariosResult> Results
+        {
+            get { return results; }
+            set { results = value; }
+        }
+
+        public List<RWSchematizationFactorsResult> SchematizationFactorResults
+        {
+            get { return schematizationFactorResults; }
+            set { schematizationFactorResults = value; }
+        }
+
+//        public string XML
+//        {
+//            get
+//            {
+//                XmlSerializer serializer = new XmlSerializer();
+//                return serializer.SerializeToString(this);
+//            }
+//            set
+//            {
+//                XmlDeserializer deserializer = new XmlDeserializer();
+//                EvaluationJob job = (EvaluationJob)deserializer.XmlDeserializeFromString(value, typeof(EvaluationJob));
+//
+//                this.DikeName = job.DikeName;
+//
+//                this.Locations.Clear();
+//                this.Locations.AddRange(job.Locations);
+//
+//                this.Results.Clear();
+//                this.Results.AddRange(job.Results);
+//                this.schematizationFactorResults.Clear();
+//                this.schematizationFactorResults.AddRange(job.schematizationFactorResults);
+//            }
+//        }
+
+        public List<Location> FailedEvaluatedLocations
+        {
+            get { return failedEvaluatedLocations; }
+            set { failedEvaluatedLocations = value; }
+        }
+
+        public void AttachResults(IEnumerable<LocationJob> locationJobs)
+        {
+            foreach (LocationJob locationJob in locationJobs)
+            {
+                foreach (Location location in this.locations)
+                {
+                    if (locationJob.Location.Name.Equals(location.Name))
+                    {
+                        if (locationJob.LocationResult == null)
+                        {
+                            locationJob.LocationResult = new LocationResult();
+                        }
+
+                        if ((this.locations.IndexOf(location) < 0) || (this.locations.IndexOf(location) >= this.results.Count))
+                        {
+                            var failedRes = new RegionalScenariosResult();
+                            failedRes.CalculationResult = CalculationResult.UnexpectedError;
+                            locationJob.LocationResult.RegionalScenariosResult = failedRes;
+                        }
+                        else
+                        {
+                            locationJob.LocationResult.RegionalScenariosResult = this.results[this.locations.IndexOf(location)];
+                        }
+
+
+//                        foreach (RWScenarioResult scenarioResult in locationJob.LocationResult.RegionalScenariosResult.RegionalScenarioResults)
+//                        {
+//                            foreach (RWScenarioProfileResult scenarioProfileResult in scenarioResult.RegionalScenarioProfileResults)
+//                            {
+//                                scenarioProfileResult.Location = locationJob.Location;
+//                            }
+//                        }  #Bka: if this is really needed, location must be added as non serializeable object.
+
+
+                        if ((this.locations.IndexOf(location) >= 0) || (this.locations.IndexOf(location) < this.results.Count))
+                        {
+                            if (schematizationFactorResults.Count > this.locations.IndexOf(location))
+                            {
+                                locationJob.LocationResult.SchematizationFactorsResult =
+                                    schematizationFactorResults[this.locations.IndexOf(location)];
+                            }
+                        }
+
+//                        if (locationJob.LocationResult.SchematizationFactorsResult != null)
+//                        {
+//                            foreach (var schematizationFactorResult in locationJob.LocationResult.SchematizationFactorsResult.SchematizationFactorResults)
+//                            {
+//                                schematizationFactorResult.Location = locationJob.Location;
+//                            }
+//                        }  #Bka: if this is really needed, location must be given a setter.
+                    }
+                }
+            }
+        }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RWScenariosResult.cs
===================================================================
diff -u -r877 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RWScenariosResult.cs	(.../RWScenarios/RWScenariosResult.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RWScenariosResult.cs	(.../RegionalAssessmentResults/RegionalScenariosResult.cs)	(revision 1065)
@@ -20,35 +20,59 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Standard.Calculation;
 
-namespace Deltares.DamEngine.Data.RWScenarios
+namespace Deltares.DamEngine.Data.RegionalAssessmentResults
 {
-    public class RWScenariosResult
+    /// <summary>
+    /// Class for results of all relevant regional scenarios
+    /// </summary>
+    public class RegionalScenariosResult
     {
-        private IList<RWScenarioResult> rwScenarioResults = new List<RWScenarioResult>();
+        private IList<RegionalScenarioResult> regionalScenarioResults = new List<RegionalScenarioResult>();
         private CalculationResult calculationResult = CalculationResult.NoRun;
 
+        /// <summary>
+        /// Gets or sets the calculation result.
+        /// </summary>
+        /// <value>
+        /// The calculation result.
+        /// </value>
         public CalculationResult CalculationResult
         {
             get { return calculationResult; }
             set { calculationResult = value; }
         }
 
-        public double SafetyFactor { get; set; } 
+        /// <summary>
+        /// Gets or sets the safety factor.
+        /// </summary>
+        /// <value>
+        /// The safety factor.
+        /// </value>
+        public double SafetyFactor { get; set; }
 
-        public IList<RWScenarioResult> RWScenarioResults
+        /// <summary>
+        /// Gets the regional scenario results.
+        /// </summary>
+        /// <value>
+        /// The regional scenario results.
+        /// </value>
+        public IList<RegionalScenarioResult> RegionalScenarioResults
         {
-            get { return rwScenarioResults; }
-            private set { rwScenarioResults = value; }
+            get { return regionalScenarioResults; }
+            private set { regionalScenarioResults = value; }
         }
 
-        public RWScenarioResult GetScenarioResult(ScenarioType scenarioType)
+        /// <summary>
+        /// Gets the scenario result.
+        /// </summary>
+        /// <param name="scenarioType">Type of the scenario.</param>
+        /// <returns></returns>
+        public RegionalScenarioResult GetScenarioResult(ScenarioType scenarioType)
         {
-            foreach (RWScenarioResult scenarioResult in this.RWScenarioResults)
+            foreach (var scenarioResult in RegionalScenarioResults)
             {
                 if (scenarioResult.ScenarioType == scenarioType)
                 {
@@ -58,182 +82,5 @@
 
             return null;
         }
-    }
-
-    public class RWScenarioResult
-    {
-        private LoadSituation loadSituation = LoadSituation.Wet;
-        private DikeDrySensitivity _dikeDrySensitivity = DikeDrySensitivity.None;
-        private HydraulicShortcutType hydraulicShortcutType = HydraulicShortcutType.NoHydraulicShortcut;
-        private UpliftType upliftType = UpliftType.NoUplift;
-        private MStabModelType modelOption;
-        private CalculationResult calculationResult = CalculationResult.NoRun;
-        private ScenarioType scenarioType = ScenarioType.Scenario01;
-
-        private IList<RWScenarioProfileResult> rwScenarioProfileResults = new List<RWScenarioProfileResult>();
-
-        public CalculationResult CalculationResult
-        {
-            get { return calculationResult; }
-            set { calculationResult = value; }
-        }
-
-        public double SafetyFactor { get; set; }
-
-        public IList<RWScenarioProfileResult> RWScenarioProfileResults
-        {
-            get { return rwScenarioProfileResults; }
-            private set { rwScenarioProfileResults = value; }
-        }
-
-        public LoadSituation LoadSituation
-        {
-            get { return loadSituation; }
-            set { loadSituation = value; }
-        }
-
-        public DikeDrySensitivity DikeDrySensitivity
-        {
-            get { return _dikeDrySensitivity; }
-            set { _dikeDrySensitivity = value; }
-        }
-
-        public HydraulicShortcutType HydraulicShortcutType
-        {
-            get { return hydraulicShortcutType; }
-            set { hydraulicShortcutType = value; }
-        }
-
-        public UpliftType UpliftType
-        {
-            get { return upliftType; }
-            set { upliftType = value; }
-        }
-
-        public MStabModelType ModelOption
-        {
-            get { return modelOption; }
-            set { modelOption = value; }
-        }
-
-        public ScenarioType ScenarioType
-        {
-            get { return scenarioType; }
-            set { scenarioType = value; }
-        }
-    }
-
-    public class RWScenarioProfileResult : RWResult
-    {
-        private FailureMechanismSystemType failureMechanismType = FailureMechanismSystemType.StabilityInside;
-        private DikeDrySensitivity dikeDrySensitivity = DikeDrySensitivity.None;
-        private HydraulicShortcutType hydraulicShortcutType = HydraulicShortcutType.NoHydraulicShortcut;
-        private UpliftType upliftType = UpliftType.NoUplift;
-        private LoadSituation loadSituation = LoadSituation.Wet;
-        private MStabModelType mstabModelOption;
-        private PipingModelType pipingModelOption;
-
-        private SoilGeometryProbability soilGeometryProbability = null;
-        private Location location = null;
-
-        private ScenarioType scenarioType = ScenarioType.Scenario01;
-        private string baseFileName = "";
-
-        public RWScenarioProfileResult(Location location, SoilGeometryProbability soilGeometryProbability)
-        {
-            this.location = location;
-            this.soilGeometryProbability = soilGeometryProbability;
-        }
-
-        public Location Location
-        {
-            get
-            {
-                return location;
-            }
-        }
-
-
-        public const string CalculationCategory = "Calculation";
-
-        public string LocationName
-        {
-            get { return location.Name; }            
-        }
-
-        public LoadSituation LoadSituation
-        {
-            get { return loadSituation; }
-            set { loadSituation = value; }
-        }
-
-        public DikeDrySensitivity DikeDrySensitivity
-        {
-            get { return dikeDrySensitivity; }
-            set { dikeDrySensitivity = value; }
-        }
-
-        public HydraulicShortcutType HydraulicShortcutType
-        {
-            get { return hydraulicShortcutType; }
-            set { hydraulicShortcutType = value; }
-        }
-
-        public UpliftType UpliftType
-        {
-            get { return upliftType; }
-            set { upliftType = value; }
-        }
-
-        public MStabModelType MstabModelOption
-        {
-            get { return mstabModelOption; }
-            set { mstabModelOption = value; }
-        }
-
-        public PipingModelType PipingModelOption 
-        {
-            get { return pipingModelOption; }
-            set { pipingModelOption = value; }
-        }
-
-        public ScenarioType ScenarioType
-        {
-            get { return scenarioType; }
-            set { scenarioType = value; }
-        }
-
-        public string BaseFileName
-        {
-            get { return baseFileName; }
-            set { baseFileName = value; }
-        }
-
-        public FailureMechanismSystemType FailureMechanismType
-        {
-            get { return failureMechanismType; }
-            set { failureMechanismType = value; }
-        }
-
-        public SoilGeometryProbability SoilGeometryProbability
-        {
-            get { return soilGeometryProbability; }            
-        }
-
-        public string SoilProfileName
-        {
-            get
-            {
-                return soilGeometryProbability.SoilProfile1D.Name;
-            }
-        }
-
-        public double SoilProfileProbability
-        {
-            get
-            {
-                return soilGeometryProbability.Probability;
-            }
-        }
-    }
+    }  
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs
===================================================================
diff -u -r955 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 955)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/LocationJob.cs	(.../LocationJob.cs)	(revision 1065)
@@ -25,7 +25,7 @@
 using Deltares.DamEngine.Data.Design;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.General.TimeSeries;
-using Deltares.DamEngine.Data.RWScenarios;
+using Deltares.DamEngine.Data.RegionalAssessmentResults;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Validation;
 
@@ -34,7 +34,7 @@
     public interface ILocationJob
     {
         Location Location { get; }
-        IEnumerable<RWScenarioResult> RWScenarioResults { get; }
+        IEnumerable<RegionalScenarioResult> RWScenarioResults { get; }
         bool HasRWScenarioResults { get; }
     }
 
@@ -82,12 +82,12 @@
             }
         }
 
-        public virtual IEnumerable<RWScenarioResult> RWScenarioResults
+        public virtual IEnumerable<RegionalScenarioResult> RWScenarioResults
         {
             get
             {
                 return !this.HasRWScenarioResults ?
-                    new List<RWScenarioResult>() : this.locationResult.RWScenariosResult.RWScenarioResults;
+                    new List<RegionalScenarioResult>() : this.locationResult.RegionalScenariosResult.RegionalScenarioResults;
             }
         }
 
@@ -102,8 +102,8 @@
 
         public bool HasRWScenarioResults
         {
-            get { return this.locationResult != null && this.locationResult.RWScenariosResult != null &&
-                this.locationResult.RWScenariosResult.RWScenarioResults.Any();
+            get { return this.locationResult != null && this.locationResult.RegionalScenariosResult != null &&
+                this.locationResult.RegionalScenariosResult.RegionalScenarioResults.Any();
             }
         }
 
@@ -157,19 +157,19 @@
         /// </summary>
         /// <param name="scenarioType"></param>
         /// <returns></returns>
-        public RWScenarioProfileResult GetRWScenarioResultWithLowestSafetyFactor(ScenarioType scenarioType)
+        public RegionalScenarioProfileResult GetRWScenarioResultWithLowestSafetyFactor(ScenarioType scenarioType)
         {
             if (this.HasRWScenarioResults)
             {
-                RWScenarioResult scenarioResult = this.LocationResult.RWScenariosResult.GetScenarioResult(scenarioType);
-                if (scenarioResult != null && scenarioResult.RWScenarioProfileResults.Count > 0)
+                var scenarioResult = this.LocationResult.RegionalScenariosResult.GetScenarioResult(scenarioType);
+                if (scenarioResult != null && scenarioResult.RegionalScenarioProfileResults.Count > 0)
                 {
-                    RWScenarioProfileResult rwScenarioProfileResult = scenarioResult.RWScenarioProfileResults[0];
-                    for (int i = 1; i < scenarioResult.RWScenarioProfileResults.Count; i++)
+                    RegionalScenarioProfileResult rwScenarioProfileResult = scenarioResult.RegionalScenarioProfileResults[0];
+                    for (int i = 1; i < scenarioResult.RegionalScenarioProfileResults.Count; i++)
                     {
-                        if (scenarioResult.RWScenarioProfileResults[i].SafetyFactor < rwScenarioProfileResult.SafetyFactor)
+                        if (scenarioResult.RegionalScenarioProfileResults[i].SafetyFactor < rwScenarioProfileResult.SafetyFactor)
                         {
-                            rwScenarioProfileResult = scenarioResult.RWScenarioProfileResults[i];
+                            rwScenarioProfileResult = scenarioResult.RegionalScenarioProfileResults[i];
                         }
                     }
                     return rwScenarioProfileResult;
@@ -254,8 +254,8 @@
                     }
                     else
                     {
-                        if (this.locationResult.RWScenariosResult != null && 
-                            this.locationResult.RWScenariosResult.CalculationResult == CalculationResult.RunFailed)
+                        if (this.locationResult.RegionalScenariosResult != null && 
+                            this.locationResult.RegionalScenariosResult.CalculationResult == CalculationResult.RunFailed)
                         {
                             // DamGlobalConstants.NoRunValue is the default result resulting in NoRun whereas the 
                             // status must be failed. So when failed set to -1.
@@ -302,20 +302,20 @@
         {
             if (this.HasRWScenarioResults)
             {
-                RWScenarioResult scenarioResult = this.LocationResult.RWScenariosResult.GetScenarioResult(scenarioType);
-                if (scenarioResult != null && scenarioResult.RWScenarioProfileResults.Count > 0)
+                var scenarioResult = this.LocationResult.RegionalScenariosResult.GetScenarioResult(scenarioType);
+                if (scenarioResult != null && scenarioResult.RegionalScenarioProfileResults.Count > 0)
                 {
                     var aboveRequiredSafety = false;
                     var belowRequiredSafety = false;
-                    for (int i = 0; i < scenarioResult.RWScenarioProfileResults.Count; i++)
+                    for (int i = 0; i < scenarioResult.RegionalScenarioProfileResults.Count; i++)
                     {
                         if (!aboveRequiredSafety)
                         {
-                            aboveRequiredSafety = scenarioResult.RWScenarioProfileResults[i].SafetyFactor >= DetrimentFactor;
+                            aboveRequiredSafety = scenarioResult.RegionalScenarioProfileResults[i].SafetyFactor >= DetrimentFactor;
                         }
                         if (!belowRequiredSafety)
                         {
-                            belowRequiredSafety = scenarioResult.RWScenarioProfileResults[i].SafetyFactor < DetrimentFactor;
+                            belowRequiredSafety = scenarioResult.RegionalScenarioProfileResults[i].SafetyFactor < DetrimentFactor;
                         }
                     }
                     return aboveRequiredSafety && belowRequiredSafety;
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RWResult.cs
===================================================================
diff -u -r1062 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RWResult.cs	(.../RWScenarios/RWResult.cs)	(revision 1062)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RWResult.cs	(.../RegionalAssessmentResults/RegionalResult.cs)	(revision 1065)
@@ -19,68 +19,69 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.ComponentModel;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Standard.Calculation;
 
-namespace Deltares.DamEngine.Data.RWScenarios
+namespace Deltares.DamEngine.Data.RegionalAssessmentResults
 {
-    public class RWResult
+    /// <summary>
+    /// Base class for regional results
+    /// </summary>
+    public class RegionalResult
     {
         private RegionalResultType regionalResultType = RegionalResultType.ProbabilityOfFailure;
         private double safetyFactor = -1;
         private double probabilityOfFailure = -1;
         private CalculationResult calculationResult = CalculationResult.NoRun;
-        private ResultEvaluation resultEvaluation = ResultEvaluation.NotEvaluated;
-        private string notes = "";
-
+        
         public const string ResultCategory = "Results";
 
-        public RWResult()
-        {
-        }
-
+        /// <summary>
+        /// Gets or sets the type of the regional result.
+        /// </summary>
+        /// <value>
+        /// The type of the regional result.
+        /// </value>
         public virtual RegionalResultType RegionalResultType
         {
             get { return regionalResultType; }
             set { regionalResultType = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the safety factor.
+        /// </summary>
+        /// <value>
+        /// The safety factor.
+        /// </value>
         public virtual double SafetyFactor
         {
             get { return safetyFactor; }
             set { safetyFactor = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the probability of failure.
+        /// </summary>
+        /// <value>
+        /// The probability of failure.
+        /// </value>
         public virtual double ProbabilityOfFailure
         {
             get { return probabilityOfFailure; }
             set { probabilityOfFailure = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the calculation result.
+        /// </summary>
+        /// <value>
+        /// The calculation result.
+        /// </value>
         public virtual CalculationResult CalculationResult
         {
             get { return calculationResult; }
             set { calculationResult = value; }
-        }
-
-        public ResultEvaluation ResultEvaluation
-        {
-            get { return resultEvaluation; }
-            set
-            {
-                resultEvaluation = value;                
-            }
-        }
-
-        [Description("Use this area to explain the valuation and for any further remarks")]
-        public string Notes
-        {
-            get { return notes; }
-            set
-            {
-                notes = value;                
-            }
         }        
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs
===================================================================
diff -u -r877 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs	(.../LocationResult.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Results/LocationResult.cs	(.../LocationResult.cs)	(revision 1065)
@@ -20,15 +20,15 @@
 // All rights reserved.
 
 using Deltares.DamEngine.Data.General.TimeSeries;
-using Deltares.DamEngine.Data.RWScenarios;
+using Deltares.DamEngine.Data.RegionalAssessmentResults;
 
 namespace Deltares.DamEngine.Data.General.Results
 {
     public class LocationResult
     {
         private TimeSerie stabilityTimeSerie = new TimeSerie();
         private TimeSerie pipingTimeSerie = new TimeSerie();
-        private RWScenariosResult rwScenariosResult;
+        private RegionalScenariosResult regionalScenariosResult;
         private RWSchematizationFactorsResult schematizationFactorsResult;
 
         public virtual TimeSerie StabilityTimeSerie
@@ -49,12 +49,12 @@
             }
         }
 
-        public virtual RWScenariosResult RWScenariosResult
+        public virtual RegionalScenariosResult RegionalScenariosResult
         {
-            get { return rwScenariosResult; }
+            get { return regionalScenariosResult; }
             set
             {
-                rwScenariosResult = value;                
+                regionalScenariosResult = value;                
             }
         }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj
===================================================================
diff -u -r1058 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 1058)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Deltares.DamEngine.Calculators.csproj	(.../Deltares.DamEngine.Calculators.csproj)	(revision 1065)
@@ -57,7 +57,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DikesAssessmentRegional\RWScenarioSelector.cs" />
+    <Compile Include="DikesAssessmentRegional\RegionalScenarioSelector.cs" />
     <Compile Include="DikesDesign\DesignCalculatorException.cs" />
     <Compile Include="RegionalAssessment\Evaluator\DikeMaterialEvaluator.cs" />
     <Compile Include="RegionalAssessment\Evaluator\UpliftEvaluator.cs" />
@@ -192,7 +192,7 @@
       <Link>KernelWrappers\DamMacroStabilityCommon\DGeoStability.exe</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>DGeoStability.exe</TargetPath>
-	  </ContentWithTargetPath>
+    </ContentWithTargetPath>
   </ItemGroup>
   <Import Project="$(SolutionDir)..\build\Deltares.DamEngine.Version.targets" />
   <PropertyGroup>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioResult.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioResult.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioResult.cs	(revision 1065)
@@ -0,0 +1,147 @@
+// Copyright (C) Stichting Deltares 2018. 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.
+
+using System.Collections.Generic;
+using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.Standard.Calculation;
+
+namespace Deltares.DamEngine.Data.RegionalAssessmentResults
+{
+    /// <summary>
+    /// Class for results of one particular regional scenario
+    /// </summary>
+    public class RegionalScenarioResult
+    {
+        private LoadSituation loadSituation = LoadSituation.Wet;
+        private DikeDrySensitivity dikeDrySensitivity = DikeDrySensitivity.None;
+        private HydraulicShortcutType hydraulicShortcutType = HydraulicShortcutType.NoHydraulicShortcut;
+        private UpliftType upliftType = UpliftType.NoUplift;
+        private MStabModelType modelOption;
+        private CalculationResult calculationResult = CalculationResult.NoRun;
+        private ScenarioType scenarioType = ScenarioType.Scenario01;
+
+        private IList<RegionalScenarioProfileResult> regionalScenarioProfileResults = new List<RegionalScenarioProfileResult>();
+
+        /// <summary>
+        /// Gets or sets the calculation result.
+        /// </summary>
+        /// <value>
+        /// The calculation result.
+        /// </value>
+        public CalculationResult CalculationResult
+        {
+            get { return calculationResult; }
+            set { calculationResult = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the safety factor.
+        /// </summary>
+        /// <value>
+        /// The safety factor.
+        /// </value>
+        public double SafetyFactor { get; set; }
+
+        /// <summary>
+        /// Gets the regional scenario profile results.
+        /// </summary>
+        /// <value>
+        /// The regional scenario profile results.
+        /// </value>
+        public IList<RegionalScenarioProfileResult> RegionalScenarioProfileResults
+        {
+            get { return regionalScenarioProfileResults; }
+            private set { regionalScenarioProfileResults = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the load situation.
+        /// </summary>
+        /// <value>
+        /// The load situation.
+        /// </value>
+        public LoadSituation LoadSituation
+        {
+            get { return loadSituation; }
+            set { loadSituation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the dike dry sensitivity.
+        /// </summary>
+        /// <value>
+        /// The dike dry sensitivity.
+        /// </value>
+        public DikeDrySensitivity DikeDrySensitivity
+        {
+            get { return dikeDrySensitivity; }
+            set { dikeDrySensitivity = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the hydraulic shortcut.
+        /// </summary>
+        /// <value>
+        /// The type of the hydraulic shortcut.
+        /// </value>
+        public HydraulicShortcutType HydraulicShortcutType
+        {
+            get { return hydraulicShortcutType; }
+            set { hydraulicShortcutType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the uplift.
+        /// </summary>
+        /// <value>
+        /// The type of the uplift.
+        /// </value>
+        public UpliftType UpliftType
+        {
+            get { return upliftType; }
+            set { upliftType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the model option.
+        /// </summary>
+        /// <value>
+        /// The model option.
+        /// </value>
+        public MStabModelType ModelOption
+        {
+            get { return modelOption; }
+            set { modelOption = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the scenario.
+        /// </summary>
+        /// <value>
+        /// The type of the scenario.
+        /// </value>
+        public ScenarioType ScenarioType
+        {
+            get { return scenarioType; }
+            set { scenarioType = value; }
+        }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioProfileResult.cs
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioProfileResult.cs	(revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/RegionalAssessmentResults/RegionalScenarioProfileResult.cs	(revision 1065)
@@ -0,0 +1,234 @@
+// Copyright (C) Stichting Deltares 2018. 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.
+
+using Deltares.DamEngine.Data.General;
+
+namespace Deltares.DamEngine.Data.RegionalAssessmentResults
+{
+    /// <summary>
+    /// Class for results of one particular regional scenario per profile
+    /// </summary>
+    public class RegionalScenarioProfileResult: RegionalResult
+    {
+        private FailureMechanismSystemType failureMechanismType = FailureMechanismSystemType.StabilityInside;
+        private DikeDrySensitivity dikeDrySensitivity = DikeDrySensitivity.None;
+        private HydraulicShortcutType hydraulicShortcutType = HydraulicShortcutType.NoHydraulicShortcut;
+        private UpliftType upliftType = UpliftType.NoUplift;
+        private LoadSituation loadSituation = LoadSituation.Wet;
+        private MStabModelType mstabModelOption;
+        private PipingModelType pipingModelOption;
+
+        private readonly SoilGeometryProbability soilGeometryProbability;
+        private readonly Location location;
+
+        private ScenarioType scenarioType = ScenarioType.Scenario01;
+        private string baseFileName = "";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RegionalScenarioProfileResult"/> class.
+        /// </summary>
+        /// <param name="location">The location.</param>
+        /// <param name="soilGeometryProbability">The soil geometry probability.</param>
+        public RegionalScenarioProfileResult(Location location, SoilGeometryProbability soilGeometryProbability)
+        {
+            this.location = location;
+            this.soilGeometryProbability = soilGeometryProbability;
+        }
+
+        /// <summary>
+        /// Gets the location.
+        /// </summary>
+        /// <value>
+        /// The location.
+        /// </value>
+        public Location Location
+        {
+            get
+            {
+                return location;
+            }
+        }
+
+
+        /// <summary>
+        /// The calculation category (constant value)
+        /// </summary>
+        public const string CalculationCategory = "Calculation";
+
+        /// <summary>
+        /// Gets the name of the location.
+        /// </summary>
+        /// <value>
+        /// The name of the location.
+        /// </value>
+        public string LocationName
+        {
+            get { return location.Name; }
+        }
+
+        /// <summary>
+        /// Gets or sets the load situation.
+        /// </summary>
+        /// <value>
+        /// The load situation.
+        /// </value>
+        public LoadSituation LoadSituation
+        {
+            get { return loadSituation; }
+            set { loadSituation = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the dike dry sensitivity.
+        /// </summary>
+        /// <value>
+        /// The dike dry sensitivity.
+        /// </value>
+        public DikeDrySensitivity DikeDrySensitivity
+        {
+            get { return dikeDrySensitivity; }
+            set { dikeDrySensitivity = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the hydraulic shortcut.
+        /// </summary>
+        /// <value>
+        /// The type of the hydraulic shortcut.
+        /// </value>
+        public HydraulicShortcutType HydraulicShortcutType
+        {
+            get { return hydraulicShortcutType; }
+            set { hydraulicShortcutType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the uplift.
+        /// </summary>
+        /// <value>
+        /// The type of the uplift.
+        /// </value>
+        public UpliftType UpliftType
+        {
+            get { return upliftType; }
+            set { upliftType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the mstab model option.
+        /// </summary>
+        /// <value>
+        /// The mstab model option.
+        /// </value>
+        public MStabModelType MstabModelOption
+        {
+            get { return mstabModelOption; }
+            set { mstabModelOption = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the piping model option.
+        /// </summary>
+        /// <value>
+        /// The piping model option.
+        /// </value>
+        public PipingModelType PipingModelOption
+        {
+            get { return pipingModelOption; }
+            set { pipingModelOption = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the scenario.
+        /// </summary>
+        /// <value>
+        /// The type of the scenario.
+        /// </value>
+        public ScenarioType ScenarioType
+        {
+            get { return scenarioType; }
+            set { scenarioType = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the base file.
+        /// </summary>
+        /// <value>
+        /// The name of the base file.
+        /// </value>
+        public string BaseFileName
+        {
+            get { return baseFileName; }
+            set { baseFileName = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the failure mechanism.
+        /// </summary>
+        /// <value>
+        /// The type of the failure mechanism.
+        /// </value>
+        public FailureMechanismSystemType FailureMechanismType
+        {
+            get { return failureMechanismType; }
+            set { failureMechanismType = value; }
+        }
+
+        /// <summary>
+        /// Gets the soil geometry probability.
+        /// </summary>
+        /// <value>
+        /// The soil geometry probability.
+        /// </value>
+        public SoilGeometryProbability SoilGeometryProbability
+        {
+            get { return soilGeometryProbability; }
+        }
+
+        /// <summary>
+        /// Gets the name of the soil profile.
+        /// </summary>
+        /// <value>
+        /// The name of the soil profile.
+        /// </value>
+        public string SoilProfileName
+        {
+            get
+            {
+                return soilGeometryProbability.SoilProfile1D.Name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the soil profile probability.
+        /// </summary>
+        /// <value>
+        /// The soil profile probability.
+        /// </value>
+        public double SoilProfileProbability
+        {
+            get
+            {
+                return soilGeometryProbability.Probability;
+            }
+        }
+    }
+}
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs
===================================================================
diff -u -r1062 -r1065
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 1062)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 1065)
@@ -24,10 +24,9 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Deltares.DamEngine.Calculators.Dikes_Assessment_Regional;
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.Geotechnics;
-using Deltares.DamEngine.Data.RWScenarios;
+using Deltares.DamEngine.Data.RegionalAssessmentResults;
 using Deltares.DamEngine.Data.Standard.Calculation;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Logging;
@@ -52,7 +51,7 @@
         private string mstabExePath = @".\DGeoStability.exe";
         private int maxCalculationCores = 255;
 
-        private Dictionary<ICalculation, RWResult> runningJobs = new Dictionary<ICalculation, RWResult>();
+        private Dictionary<ICalculation, RegionalResult> runningJobs = new Dictionary<ICalculation, RegionalResult>();
         private bool isSkipStabilityCalculation = false;
         
         public PipingModelType PipingModelType { get; set; }
@@ -132,7 +131,7 @@
             try
             {
 
-                List<RWScenarioProfileResult> tasks = this.FillQueue();
+                List<RegionalScenarioProfileResult> tasks = this.FillQueue();
 
                 General.Parallel.Run(tasks, this.RunTask, this.progressDelegate, this.MaxCalculationCores);
                 this.FillResults(tasks);
@@ -176,9 +175,9 @@
             set { maxCalculationCores = value; }
         }
 
-        private List<RWScenarioProfileResult> FillQueue()
+        private List<RegionalScenarioProfileResult> FillQueue()
         {
-            List<RWScenarioProfileResult> tasks = new List<RWScenarioProfileResult>();
+            List<RegionalScenarioProfileResult> tasks = new List<RegionalScenarioProfileResult>();
 
             this.evaluationJob.FailedEvaluatedLocations = new List<Location>();
             foreach (Location location in this.evaluationJob.Locations)
@@ -223,7 +222,7 @@
                             {
 
                                 SoilProfile soilProfile = soilGeometryProbability.SoilProfile1D;
-                                IList<RWScenarioProfileResult> rwScenarios = null;
+                                IList<RegionalScenarioProfileResult> rwScenarios = null;
                                 try
                                 {
                                     rwScenarios = this.GetRWScenarios(location, soilGeometryProbability);
@@ -242,7 +241,7 @@
                                 }
                                 if (rwScenarios != null)
                                 {
-                                    foreach (RWScenarioProfileResult job in rwScenarios)
+                                    foreach (RegionalScenarioProfileResult job in rwScenarios)
                                     {
                                         tasks.Add(job);
                                     }
@@ -256,17 +255,17 @@
             return tasks;
         }
 
-        private IList<RWScenarioProfileResult> GetRWScenarios(Location location, SoilGeometryProbability soilGeometryProbability)
+        private IList<RegionalScenarioProfileResult> GetRWScenarios(Location location, SoilGeometryProbability soilGeometryProbability)
         {
-            RWScenarioSelector selector = new RWScenarioSelector();
+            RegionalScenarioSelector selector = new RegionalScenarioSelector();
             selector.PipingModelType = PipingModelType;
             selector.MStabParameters = MStabParameters;
             return selector.GetScenarios(location, soilGeometryProbability);
         }
 
         private void RunTask(object task)
         {
-            RWScenarioProfileResult job = (RWScenarioProfileResult)task;
+            var job = (RegionalScenarioProfileResult)task;
 
             try
             {
@@ -290,7 +289,7 @@
         /// Select which job processor to use, depending on failuremechanism
         /// </summary>
         /// <param name="job"></param>
-        private void ProcessJob(RWScenarioProfileResult job)
+        private void ProcessJob(RegionalScenarioProfileResult job)
         {
             Debug.WriteLine(String.Format("Job {0}, location {1}, Scenario {2}", job.FailureMechanismType.ToString(), job.LocationName, job.ScenarioType.ToString()));
             switch (job.FailureMechanismType)
@@ -310,7 +309,7 @@
         /// Process a job for failuremechanism Piping
         /// </summary>
         /// <param name="job"></param>
-        private void ProcessJobPiping(RWScenarioProfileResult job)
+        private void ProcessJobPiping(RegionalScenarioProfileResult job)
         {
 //            if (job.Location.ModelFactors.UpliftCriterionPiping.HasValue)
 //            {
@@ -355,7 +354,7 @@
 
         }
 
-        private string GetCalculationNameForPipingCalculator(RWScenarioProfileResult job)
+        private string GetCalculationNameForPipingCalculator(RegionalScenarioProfileResult job)
         {
             string calculationName;
             switch (job.PipingModelOption)
@@ -408,7 +407,7 @@
         /// Process a job for failuremechanism Stability
         /// </summary>
         /// <param name="job"></param>
-        private void ProcessJobStability(RWScenarioProfileResult job)
+        private void ProcessJobStability(RegionalScenarioProfileResult job)
         {
 //            StabilityCalculation calculator = new StabilityCalculation();
 
@@ -439,7 +438,7 @@
 
 //                job.CalculationResult = calculator.GetResults(ref results);
                 //XmlDeserializer deserializer = new XmlDeserializer();
-//                RWResult result = (RWResult)deserializer.XmlDeserializeFromString(results, typeof(RWResult));
+//                RegionalResult result = (RegionalResult)deserializer.XmlDeserializeFromString(results, typeof(RegionalResult));
 
 //                job.SafetyFactor = result.SafetyFactor;
 //                job.ProbabilityOfFailure = result.ProbabilityOfFailure;
@@ -469,7 +468,7 @@
             {
                 if (logMessage.Subject != null)
                 {
-                    RWScenarioProfileResult job = (RWScenarioProfileResult)runningJobs[(ICalculation)logMessage.Subject];
+                    var job = (RegionalScenarioProfileResult)runningJobs[(ICalculation)logMessage.Subject];
                     logMessage.Subject = job.Location;                 
                 }
             }
@@ -480,25 +479,25 @@
         /// <summary>
         /// Fill the results for the scenarios
         /// </summary>
-        private void FillResults(List<RWScenarioProfileResult> tasks)
+        private void FillResults(List<RegionalScenarioProfileResult> tasks)
         {
             // Fill scenariosResult structure with jobs just run 
 
             foreach (Location location in this.evaluationJob.Locations)
             {
                 try
                 {
-                    RWScenariosResult scenariosResult = new RWScenariosResult();
+                    RegionalScenariosResult scenariosResult = new RegionalScenariosResult();
 
                     if (this.evaluationJob.FailedEvaluatedLocations.IndexOf(location) < 0)
                     {
                         // scenarios were succesfully created, so results are available
-                        foreach (RWScenarioProfileResult job in tasks)
+                        foreach (RegionalScenarioProfileResult job in tasks)
                         {
                             if (job.LocationName.Equals(location.Name))
                             {
-                                RWScenarioResult scenarioResult = null;
-                                foreach (RWScenarioResult existingScenarioResult in scenariosResult.RWScenarioResults)
+                                RegionalScenarioResult scenarioResult = null;
+                                foreach (var existingScenarioResult in scenariosResult.RegionalScenarioResults)
                                 {
                                     if (existingScenarioResult.ScenarioType == job.ScenarioType)
                                     {
@@ -508,19 +507,19 @@
 
                                 if (scenarioResult == null)
                                 {
-                                    scenarioResult = new RWScenarioResult();
+                                    scenarioResult = new RegionalScenarioResult();
                                     scenarioResult.ScenarioType = job.ScenarioType;
 
-                                    scenariosResult.RWScenarioResults.Add(scenarioResult);
+                                    scenariosResult.RegionalScenarioResults.Add(scenarioResult);
                                 }
 
-                                scenarioResult.RWScenarioProfileResults.Add(job);
+                                scenarioResult.RegionalScenarioProfileResults.Add(job);
                             }
                         }
 
                         // Combine results
 
-                        foreach (RWScenarioResult scenarioResult in scenariosResult.RWScenarioResults)
+                        foreach (var scenarioResult in scenariosResult.RegionalScenarioResults)
                         {
                             this.CombineProfiles(scenarioResult);
                         }
@@ -541,7 +540,7 @@
                 }
                 catch (Exception e)
                 {
-                    RWScenariosResult scenariosResult = new RWScenariosResult
+                    RegionalScenariosResult scenariosResult = new RegionalScenariosResult
                                                             {
                                                                 CalculationResult = CalculationResult.RunFailed,
                                                                 SafetyFactor = double.NaN
@@ -552,12 +551,12 @@
 
         }
 
-        private void CombineProfiles(RWScenarioResult scenarioResult)
+        private void CombineProfiles(RegionalScenarioResult scenarioResult)
         {
             // combine results of profiles
 
             scenarioResult.SafetyFactor = Double.MaxValue;
-            foreach (RWScenarioProfileResult profileResult in scenarioResult.RWScenarioProfileResults)
+            foreach (var profileResult in scenarioResult.RegionalScenarioProfileResults)
             {
                 if (profileResult.CalculationResult == CalculationResult.Succeeded)
                 {
@@ -572,16 +571,16 @@
             if (scenarioResult.CalculationResult != CalculationResult.Succeeded)
             {
                 // no succesful calculations found
-                scenarioResult.CalculationResult = scenarioResult.RWScenarioProfileResults[0].CalculationResult;
-                scenarioResult.SafetyFactor = scenarioResult.RWScenarioProfileResults[0].SafetyFactor;
+                scenarioResult.CalculationResult = scenarioResult.RegionalScenarioProfileResults[0].CalculationResult;
+                scenarioResult.SafetyFactor = scenarioResult.RegionalScenarioProfileResults[0].SafetyFactor;
             }
         }
 
-        private void CombineScenarios(RWScenariosResult scenariosResult)
+        private void CombineScenarios(RegionalScenariosResult scenariosResult)
         {
             // combine results of scenarios
             scenariosResult.SafetyFactor = Double.MaxValue;
-            foreach (RWScenarioResult scenarioResult in scenariosResult.RWScenarioResults)
+            foreach (var scenarioResult in scenariosResult.RegionalScenarioResults)
             {
                 if (scenarioResult.CalculationResult == CalculationResult.Succeeded)
                 {
Fisheye: Tag 1065 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/RWResult.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1065 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/RWScenariosResult.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1065 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/RWScenarios/EvaluationJob.cs'.
Fisheye: No comparison available.  Pass `N' to diff?