Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
===================================================================
diff -u -r461 -r501
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj (.../Deltares.DamEngine.Interface.Tests.csproj) (revision 461)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj (.../Deltares.DamEngine.Interface.Tests.csproj) (revision 501)
@@ -87,6 +87,9 @@
+
+ PreserveNewest
+
PreserveNewest
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/BlighInputFile.xml
===================================================================
diff -u
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/BlighInputFile.xml (revision 0)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/BlighInputFile.xml (revision 501)
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs
===================================================================
diff -u -r465 -r501
--- dam engine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs (.../EngineInterface.cs) (revision 465)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/EngineInterface.cs (.../EngineInterface.cs) (revision 501)
@@ -20,11 +20,13 @@
// All rights reserved.
using System;
+using Deltares.DamEngine.Calculators.Dikes_Design;
using Deltares.DamEngine.Data.General;
using Deltares.DamEngine.Data.Standard;
using Deltares.DamEngine.Data.Standard.Logging;
using Deltares.DamEngine.Io;
using Deltares.DamEngine.Io.XmlInput;
+using Deltares.DamEngine.Io.XmlOutput;
namespace Deltares.DamEngine.Interface
{
@@ -152,9 +154,24 @@
public string Run(out string outputXml)
{
SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = "Start calculation" });
+
+ switch (DamProjectData.DamProjectType)
+ {
+ case DamProjectType.Assessment:
+ case DamProjectType.AssessmentRegional:
+ case DamProjectType.NWO:
+ case DamProjectType.Operational:
+ throw new NotImplementedException();
+ case DamProjectType.Design:
+ DesignCalculator designCalculator = new DesignCalculator();
+
+ designCalculator.Execute(DamProjectData);
+ break;
+ }
+ Output output = FillXmlOutputFromDam.CreateOutput(DamProjectData);
+ outputXml = DamXmlSerialization.SaveOutputAsXmlString(output);
SendMessage(new LogMessage() { MessageType = LogMessageType.Info, Message = "End calculation" });
- outputXml = null;
- return null;
+ return outputXml;
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs
===================================================================
diff -u -r461 -r501
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs (.../EngineInterfaceTests.cs) (revision 461)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs (.../EngineInterfaceTests.cs) (revision 501)
@@ -42,5 +42,19 @@
EngineInterface engineInterface = new EngineInterface(xmlString);
Assert.IsNotNull(engineInterface.DamProjectData);
}
+
+ [Test, Ignore("Work in progress")]
+ public void CanPerformBlighDesign()
+ {
+ const string fileName = @"TestFiles\BlighInputFile.xml";
+ string inputString = File.ReadAllText(fileName);
+ EngineInterface engineInterface = new EngineInterface(inputString);
+ Assert.IsNotNull(engineInterface.DamProjectData);
+ string outputString;
+ var calculationMessages = engineInterface.Run(out outputString);
+ Assert.IsNotNull(calculationMessages);
+ Assert.IsNotNull(outputString);
+
+ }
}
}
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj
===================================================================
diff -u -r469 -r501
--- dam engine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj (.../Deltares.DamEngine.Interface.csproj) (revision 469)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/Deltares.DamEngine.Interface.csproj (.../Deltares.DamEngine.Interface.csproj) (revision 501)
@@ -72,6 +72,10 @@
+
+ {E943B1D5-FAFA-4AFE-9071-F8B22CF612EA}
+ Deltares.DamEngine.Calculators
+
{b7a49c1a-1c91-4d72-aba9-9fbac2509d8e}
Deltares.DamEngine.Data