Index: DamClients/DamUI/branches/nwo/src/Dam/Tests/DamCalculationBenchmarkTest.cs
===================================================================
diff -u -r875 -r1533
--- DamClients/DamUI/branches/nwo/src/Dam/Tests/DamCalculationBenchmarkTest.cs	(.../CalcualtionIncluded/src/Dam/Tests/DamCalculationBenchmarkTest.cs)	(revision 875)
+++ DamClients/DamUI/branches/nwo/src/Dam/Tests/DamCalculationBenchmarkTest.cs	(.../nwo/src/Dam/Tests/DamCalculationBenchmarkTest.cs)	(revision 1533)
@@ -1,12 +1,23 @@
-//-----------------------------------------------------------------------
-// <copyright file="DamProjectData.cs" company="Deltares">     
-//  Copyright (c) 2011 Deltares. All rights reserved.
-// </copyright>
-// <author>B.S.T.I.M. The</author>
-// <email>tom.the@deltares.nl</email>
-// <date>04-08-2011</date>
-// <summary>n.a.</summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the application DAM - UI.
+//
+// DAM - UI is free software: you can redistribute it and/or modify
+// it under the terms of the GNU 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
 
 namespace Deltares.Dam.Tests
 {
@@ -15,7 +26,7 @@
     using Data;
     using NUnit.Framework;
 
-    [TestFixture]
+    [TestFixture, Category("Calculation")]
     public class DamCalculationBenchmarkTest
     {
         const string cmstabProgramPath = ".\\DGeoStability.exe";
@@ -42,10 +53,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                // List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(1.024077029, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(49.1, allCalculationresults[0][0].Pl3LocalLocationXMinUplift.Value, cTolerance); // Due to improvement of PLLineCreator this value was changed from 51.1
@@ -69,10 +83,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(0.905914295, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.289245668, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -95,10 +112,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(1.0, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.289245668, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -121,10 +141,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(0.969283045, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.6382263, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -147,11 +170,14 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType = StabilityKernelType.DamClassicWti; // = StabilityKernelType.WtiMacroStability;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //damProjectData.DamProjectCalculationSpecification.SelectedStabilityKernelType = StabilityKernelType.DamClassicWti; // = StabilityKernelType.WtiMacroStability;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(0.969283045, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(-1.6382263, allCalculationresults[0][0].Pl3HeadAdjusted.Value, cTolerance);
@@ -174,10 +200,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsFalse(allCalculationresults[0][0].IsUplift.Value);
                 Assert.AreEqual(1.512062521, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance);
                 Assert.AreEqual(43.0, allCalculationresults[0][0].Pl3LocalLocationXMinUplift.Value, cTolerance);
@@ -198,10 +227,13 @@
                 DamIntegrationTestHelper.AddCalculationSpecificationsToDamProjectData(damProjectData);
 
                 // Calculate dijkring
-                var damProjectCalculator = new DamProjectCalculator(damProjectData);
-                damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
-                damProjectCalculator.MStabProgramPath = cmstabProgramPath;
-                List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                //  TODO: DAMUI Start
+                //var damProjectCalculator = new DamProjectCalculator(damProjectData);
+                //damProjectCalculator.CalculationBaseDirectory = Path.GetFullPath(Path.Combine(cFolderName, "CalculationFiles"));
+                //damProjectCalculator.MStabProgramPath = cmstabProgramPath;
+                //List<List<CsvExportData>> allCalculationresults = damProjectCalculator.Calculate(damProjectData, dike.Scenarios);
+                List<List<CsvExportData>> allCalculationresults = null;
+                //  TODO: DAMUI End
                 Assert.IsTrue(allCalculationresults[0][0].IsUplift.Value);
                 // Values at bottom ditch dikeside
                 Assert.AreEqual(0.820097604, allCalculationresults[0][0].Pl3MinUplift.Value, cTolerance); 
@@ -242,26 +274,29 @@
         /// <returns></returns>
         private EvaluationJob ComputeEvaluationJobWithScenariosSelected(DamProjectData damProjectData)
         {
-            var rwScenariosCalculation = new RWScenariosCalculation();
+            //  TODO: DAMUI Start
+            //var rwScenariosCalculation = new RWScenariosCalculation();
 
-            rwScenariosCalculation.MStabExePath = Path.GetFullPath(cmstabProgramPath);
+            //rwScenariosCalculation.MStabExePath = Path.GetFullPath(cmstabProgramPath);
 
-            foreach (LocationJob locationjob in damProjectData.LocationJobs)
-            {
-                locationjob.Run = true;
-            }
-            EvaluationJob evaluationJob = damProjectData.GetEvaluationJob();
+            //foreach (LocationJob locationjob in damProjectData.LocationJobs)
+            //{
+            //    locationjob.Run = true;
+            //}
+            //EvaluationJob evaluationJob = damProjectData.GetEvaluationJob();
 
-            rwScenariosCalculation.Load(evaluationJob.XML);
-            rwScenariosCalculation.IsSkipStabilityCalculation = true; // skip actual calculations, because only scenario selection is tested
-            rwScenariosCalculation.Run();
+            //rwScenariosCalculation.Load(evaluationJob.XML);
+            //rwScenariosCalculation.IsSkipStabilityCalculation = true; // skip actual calculations, because only scenario selection is tested
+            //rwScenariosCalculation.Run();
 
-            string results = "";
-            rwScenariosCalculation.GetResults(ref results);
+            //string results = "";
+            //rwScenariosCalculation.GetResults(ref results);
 
-            evaluationJob.XML = results;
-            evaluationJob.AttachResults(damProjectData.LocationJobs);
-            return evaluationJob;
+            //evaluationJob.XML = results;
+            //evaluationJob.AttachResults(damProjectData.LocationJobs);
+            //return evaluationJob;
+            return null;
+            //  TODO: DAMUI End
         }
 
         /// <summary>