Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
===================================================================
diff -u -r1816 -r1830
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 1816)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs (.../OperationalPulauTekongTests.cs) (revision 1830)
@@ -36,8 +36,12 @@
class OperationalPulauTekongTests
{
private const double tolerance = 0.0005;
+ private const double novalue = -999.0;
+ private const string stabilityOutsideFactor = "StabilityOutsideFactor";
[Test]
- public void Run_UsingTestFiles_HasExpectedResultsInOutputFile()
+ [TestCase(@"PulauTekong.InputFile.xml", 2.486106, 2.114159)]
+ [TestCase(@"PulauTekong.InputFile-NoValues.xml", novalue, novalue)]
+ public void Run_UsingTestFiles_HasExpectedResultsInOutputFile(string inputTestcaseFilename, double valueEntry1, double valueEntry2)
{
const string calcDir = "TestOperationalPulauTekong";
const string workingDir = @"TestFiles\";
@@ -51,7 +55,7 @@
// Switch to TestFiles directory to check if DamLive can also run from another directory
Directory.SetCurrentDirectory(workingDir);
// Based on "Deltares.DamLive.Tests.PulauTekongTest"
- const string inputFileName = baseTestDirectory + @"PulauTekong.InputFile.xml";
+ string inputFileName = baseTestDirectory + inputTestcaseFilename;
const string outputFileName = baseTestDirectory + @"PulauTekong.OutputFile.xml";
string inputString = File.ReadAllText(inputFileName);
inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
@@ -65,8 +69,10 @@
Assert.IsNotNull(outputString);
var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
- Assert.AreEqual(2.486106, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance);
- Assert.AreEqual(2.114159, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance);
+ Assert.AreEqual(stabilityOutsideFactor, output.Results.OperationalOutputTimeSeries[0].ParameterId);
+ Assert.AreEqual(valueEntry1, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance);
+ Assert.AreEqual(stabilityOutsideFactor, output.Results.OperationalOutputTimeSeries[1].ParameterId);
+ Assert.AreEqual(valueEntry2, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance);
}
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.InputFile-NoValues.xml
===================================================================
diff -u
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.InputFile-NoValues.xml (revision 0)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/TestFiles/Operational/PulauTekong/PulauTekong.InputFile-NoValues.xml (revision 1830)
@@ -0,0 +1,607 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r1809 -r1830
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 1809)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 1830)
@@ -128,6 +128,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
@@ -310,12 +313,6 @@
PreserveNewest
-
-
-
-
-
-
PreserveNewest
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs
===================================================================
diff -u -r877 -r1830
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/TimeSeries/TimeSerieEntry.cs (.../TimeSerieEntry.cs) (revision 1830)
@@ -50,7 +50,11 @@
return new TimeSerieEntry
{
DateTime = DateTime,
- Flag = Flag,
+ Flag = Flag,
+ BasisFileName = BasisFileName,
+ RelativeCalculationPathName = RelativeCalculationPathName,
+ StochastValue = StochastValue,
+ Value = Value
};
}