Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs
===================================================================
diff -u -r1651 -r1653
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs (.../OperationalTests.cs) (revision 1651)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/OperationalTests.cs (.../OperationalTests.cs) (revision 1653)
@@ -61,7 +61,9 @@
Assert.IsNotNull(outputString);
var output = DamXmlSerialization.LoadOutputFromXmlString(outputString);
DamProjectData actualDamProjectData = FillDamFromXmlOutput.CreateDamProjectData(null, output);
- Assert.AreEqual(1.2257, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance);
+ Assert.AreEqual(1.226, output.Results.OperationalOutputTimeSeries[0].Entries.TimeSerieEntry[0].Value, tolerance);
+ Assert.AreEqual(1.244, output.Results.OperationalOutputTimeSeries[1].Entries.TimeSerieEntry[0].Value, tolerance);
+ Assert.AreEqual(1.311, output.Results.OperationalOutputTimeSeries[2].Entries.TimeSerieEntry[0].Value, tolerance);
}
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml
===================================================================
diff -u -r1652 -r1653
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml (.../OperationalSet2.xml) (revision 1652)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/OperationalSet2.xml (.../OperationalSet2.xml) (revision 1653)
@@ -1,28 +1,28 @@
-
+
-
+
-
+
-
+
@@ -286,7 +286,7 @@
-
+
@@ -295,6 +295,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -351,9 +365,9 @@
-
-
-
+
+
+
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs
===================================================================
diff -u -r1647 -r1653
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1647)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1653)
@@ -278,6 +278,7 @@
var location0 = locations[0];
var repository = new SensorRepository(location0);
+ location0.SensorLocation.ResetGroupID(1);
repository.Add(new[] { sensor1, sensor2, sensor3, sensor4, sensor5, sensor6, sensor7 });
var sensorLocation = location0.SensorLocation;
sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
@@ -292,6 +293,7 @@
var location1 = locations[1];
repository = new SensorRepository(location1);
+ location1.SensorLocation.ResetGroupID(2);
repository.Add(new[] { sensor1, sensor8, sensor9, sensor10 });
sensorLocation = location1.SensorLocation;
sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
@@ -306,6 +308,7 @@
var location2 = locations[2];
repository = new SensorRepository(location2);
+ location2.SensorLocation.ResetGroupID(3);
repository.Add(new[] { sensor1, sensor11, sensor12, sensor13, sensor14, sensor15 });
sensorLocation = location2.SensorLocation;
sensorLocation.SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.Sensor;
Index: DamClassic/trunk/src/Dam/DamLive/SensorModelRunner.cs
===================================================================
diff -u -r874 -r1653
--- DamClassic/trunk/src/Dam/DamLive/SensorModelRunner.cs (.../SensorModelRunner.cs) (revision 874)
+++ DamClassic/trunk/src/Dam/DamLive/SensorModelRunner.cs (.../SensorModelRunner.cs) (revision 1653)
@@ -9,7 +9,11 @@
{
// TODO: this class is just passing its input to another class, see if this class can be removed from the design
public class SensorModelRunner : ModelRunner
- {
+ {
+ ///
+ /// Performs all the steps to transform the input time series collection to
+ /// the output time series collection with the calculated values
+ ///
public override void Run()
{
var calcParams = CalculationParameters ?? new CalculationParameters();
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs
===================================================================
diff -u -r1651 -r1653
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 1651)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesOperational/OperationalCalculator.cs (.../OperationalCalculator.cs) (revision 1653)
@@ -395,7 +395,7 @@
}
hasFirstSeriesEntries = true;
}
- location.SensorLocation.SensorValues = values;
+ location.SensorLocation.SensorValues = values; // Todo #The: only set sensorvalues to values for this location
}
///