Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorTimeSeriesProcessor.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Data/Sensors/SensorTimeSeriesProcessor.cs (.../SensorTimeSeriesProcessor.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Data/Sensors/SensorTimeSeriesProcessor.cs (.../SensorTimeSeriesProcessor.cs) (revision 1598) @@ -23,7 +23,7 @@ private class LocationsWithSensorData : PredicateSpecification { public LocationsWithSensorData() - : base(l => l.HasSensorData && l.SensorData.SensorCount > 0) + : base(l => l.HasSensorLocation && l.SensorLocation.SensorCount > 0) { } } @@ -140,8 +140,8 @@ PLLines plLines = null; var location = Locations.First(l => series.LocationId == l.Name); var sensorValues = values[entry.DateTime][location]; - var sensorSetup = location.SensorData; - var lineTypes = location.SensorData.Sensors.SelectMany(s => s.PLLineMappings).Distinct().ToList(); + var sensorSetup = location.SensorLocation; + var lineTypes = location.SensorLocation.Sensors.SelectMany(s => s.PLLineMappings).Distinct().ToList(); var requiredSafetyFactorPiping = 0.0; // normally only needed for design; it is used here because it is part of the parameterlist of the constructor var modelParametersForPLLines = new ModelParametersForPLLines @@ -376,8 +376,8 @@ bool isCombined = stabilityParams.IsCombinedBishopUpliftVanCalculation; var soilGeometry = CalculationHelper.GetSoilGeometryType(location, Path.GetDirectoryName(CalculationParameters.WorkingPath)); - var sensorSetup = location.SensorData; - var lineTypes = location.SensorData.Sensors.SelectMany(s => s.PLLineMappings).Distinct().ToList(); + var sensorSetup = location.SensorLocation; + var lineTypes = location.SensorLocation.Sensors.SelectMany(s => s.PLLineMappings).Distinct().ToList(); //double waterLevel = sensorSetup.GetWaterLevelAtRiver(sensorValues); plLines = CreateAllPlLines(sensorValues, sensorSetup, lineTypes); @@ -408,15 +408,15 @@ /// Creates all the PL lines from the specified sensor values. /// /// The sensor values. - /// The sensor setup. + /// The sensor setup. /// The line types. /// The pl lines. /// /// - private static PLLines CreateAllPlLines(IDictionary sensorValues, SensorLocation sensorSetup, IEnumerable lineTypes) + private static PLLines CreateAllPlLines(IDictionary sensorValues, SensorLocation sensorLocation, IEnumerable lineTypes) { PLLines plLines; - var creator = SensorPLLineCreator.CreateInstance(sensorSetup, sensorValues, lineTypes); + var creator = SensorPLLineCreator.CreateInstance(sensorLocation, sensorValues, lineTypes); try { plLines = creator.CreateAllPLLines(); @@ -440,7 +440,7 @@ var firstSeriesEntries = new HashSet(); bool hasFirstSeriesEntries = false; - foreach (var sensor in location.SensorData.Sensors) + foreach (var sensor in location.SensorLocation.Sensors) { IEnumerable series = InputTimeSeriesCollection.GetSeriesByLocationId(sensor.Name); ThrowIfSensorNotExists(sensor, series.Any()); @@ -563,7 +563,7 @@ private void ThrowIfSensorsAreMissingInInputFile(Location location) { var sensorsNotFound = ( - from sensor in location.SensorData.Sensors + from sensor in location.SensorLocation.Sensors let series = InputTimeSeriesCollection.GetSeriesByLocationId(sensor.Name) where !series.Any() select sensor.Name).ToList(); Index: DamClassic/trunk/src/Dam/Data/Deltares.Dam.Data.csproj =================================================================== diff -u -r1442 -r1598 --- DamClassic/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 1442) +++ DamClassic/trunk/src/Dam/Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 1598) @@ -441,7 +441,6 @@ SoilProfileDataSet.xsd - Component SoilProfileDataSet.cs Index: DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs (.../Program.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Tools/CsvToDamxConverter/Program.cs (.../Program.cs) (revision 1598) @@ -464,17 +464,17 @@ id = record.GroupID; - var sensorData = location.SensorData; - sensorData.Group.ID = record.GroupID; - sensorData.Alias = record.Alias; - sensorData.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; - sensorData.PL1WaterLevelAtPolder = record.InputPL1PolderLevel; - sensorData.PL3 = record.InputPL3; - sensorData.PL4 = record.InputPL4; + var sensorLocation = location.SensorLocation; + sensorLocation.Group.ID = record.GroupID; + sensorLocation.Alias = record.Alias; + sensorLocation.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; + sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; + sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; + sensorLocation.PL1WaterLevelAtPolder = record.InputPL1PolderLevel; + sensorLocation.PL3 = record.InputPL3; + sensorLocation.PL4 = record.InputPL4; } catch (Exception e) { Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs (.../SensorImportFromExcelSheet.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Data/Sensors/SensorImportFromExcelSheet.cs (.../SensorImportFromExcelSheet.cs) (revision 1598) @@ -281,17 +281,17 @@ id = record.GroupID; - var sensorData = location.SensorData; - sensorData.Group.ID = record.GroupID; - sensorData.Alias = record.Alias; - sensorData.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; - sensorData.PL1WaterLevelAtPolder = record.InputPL1PolderLevel; - sensorData.PL3 = record.InputPL3; - sensorData.PL4 = record.InputPL4; + var sensorLocation = location.SensorLocation; + sensorLocation.Group.ID = record.GroupID; + sensorLocation.Alias = record.Alias; + sensorLocation.PL1WaterLevelAtRiver = record.InputPL1OuterWaterLevel; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = record.InputPL1PLLineOffsetBelowDikeTopAtRiver; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = record.InputPL1PLLineOffsetBelowDikeTopAtPolder; + sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = record.InputPL1PLLineOffsetBelowShoulderBaseInside; + sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = record.InputPL1PLLineOffsetBelowDikeToeAtPolder; + sensorLocation.PL1WaterLevelAtPolder = record.InputPL1PolderLevel; + sensorLocation.PL3 = record.InputPL3; + sensorLocation.PL4 = record.InputPL4; } catch (Exception e) { Index: DamClassic/trunk/src/Dam/Data/DamProjectData.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Data/DamProjectData.cs (.../DamProjectData.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Data/DamProjectData.cs (.../DamProjectData.cs) (revision 1598) @@ -679,23 +679,23 @@ } foreach (var location in Locations) { - var sd = location.SensorData; + var sensorLocation = location.SensorLocation; - foreach (var sensor in sd.Sensors ) + foreach (var sensor in sensorLocation.Sensors ) { if (sensorData.GetSensorById(sensor.ID) == null) { sensorData.Sensors.Add(sensor); } } - if (sensorData.GetGroupById(sd.Group.ID) == null && sd.Group.ID >= 0) + if (sensorData.GetGroupById(sensorLocation.Group.ID) == null && sensorLocation.Group.ID >= 0) { - sd.Group.PickSensors = sensorData.Sensors; - sensorData.SensorGroups.Add(sd.Group); + sensorLocation.Group.PickSensors = sensorData.Sensors; + sensorData.SensorGroups.Add(sensorLocation.Group); } - if (sensorData.GetSensorLocationByLocationName(sd.LocationName) == null) + if (sensorData.GetSensorLocationByLocationName(sensorLocation.LocationName) == null) { - sensorData.SensorLocations.Add(sd); + sensorData.SensorLocations.Add(sensorLocation); } } } Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreator.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreator.cs (.../SensorPLLineCreator.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Data/Sensors/SensorPLLineCreator.cs (.../SensorPLLineCreator.cs) (revision 1598) @@ -12,7 +12,8 @@ /// The sensor location. /// The sensor values. /// - public static SensorPLLineCreator CreateInstance(SensorLocation sensorLocation, IDictionary sensorValues) + public static SensorPLLineCreator + CreateInstance(SensorLocation sensorLocation, IDictionary sensorValues) { return CreateInstance(sensorLocation, sensorValues, new[] {PLLineType.PL1, PLLineType.PL3, PLLineType.PL4,}); } Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 1598) @@ -448,13 +448,13 @@ }) using (var testLocation = new Location("testLocation") { SurfaceLine2 = surfaceLine }) { - testLocation.AddNewSensorData(); + testLocation.AddNewSensorLocation(); var repository = new SensorRepository(testLocation); repository.Add(new[] { sensor1, sensor2, sensor3 }); - testLocation.SensorData.SurfaceLine.EnsurePointOfType(0, 0, 0, CharacteristicPointType.SurfaceLevelOutside); + testLocation.SensorLocation.SurfaceLine.EnsurePointOfType(0, 0, 0, CharacteristicPointType.SurfaceLevelOutside); - var table = testLocation.SensorData.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).ToList(); + var table = testLocation.SensorLocation.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).ToList(); Assert.AreEqual(5, table.ElementAt(0).Key); Assert.AreEqual(10, table.ElementAt(1).Key); @@ -465,7 +465,7 @@ Assert.AreEqual(12, table[2].Key); var sortedSensors = - testLocation.SensorData.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).Select(s => s.Value).ToList(); + testLocation.SensorLocation.GetSensorsSortedByRelativeLocationAlongProfile(PLLineType.PL1).Select(s => s.Value).ToList(); Assert.AreEqual(5, sortedSensors[0].RelativeLocation); Assert.AreEqual(10, sortedSensors[1].RelativeLocation); Index: DamClassic/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs (.../DamSpatialEditorDecorator.cs) (revision 1598) @@ -354,7 +354,7 @@ private void DrawSensors() { // Add drawing objects for sensors - var sensorLocation = locationJob.Location.SensorData; + var sensorLocation = locationJob.Location.SensorLocation; if (sensorLocation != null) { foreach (var sensor in sensorLocation.Sensors) Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorImportFromExcelSheetTest.cs (.../SensorImportFromExcelSheetTest.cs) (revision 1598) @@ -68,25 +68,25 @@ //damProject.SaveXMLProject(projectFilename, damProject); // Check data for the second location - var sensorData = dike.Locations[1].SensorData; - Assert.AreEqual(4, sensorData.SensorCount); + var sensorLocation = dike.Locations[1].SensorLocation; + Assert.AreEqual(4, sensorLocation.SensorCount); var sensorIds = (new int[] { 0, 10, 11, 12 }).ToList(); - foreach (var sensor in sensorData.Sensors) + foreach (var sensor in sensorLocation.Sensors) { Assert.IsTrue(sensorIds.Contains(sensor.ID), String.Format("Sensor Id {0} not part of expected list", sensor.ID)); } - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL1PLLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL1PLLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL1PLLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorData.PL1WaterLevelAtRiver); - Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.PL1WaterLevelAtPolder); - Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorData.PL3); - Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorData.PL4); - Assert.AreEqual(-1.33, sensorData.PolderLevel, cTolerance); - Assert.AreEqual(0.8, sensorData.HeadPl3, cTolerance); - Assert.AreEqual(0.8, sensorData.HeadPl4, cTolerance); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside); + Assert.AreEqual(DataSourceTypeSensors.Sensor, sensorLocation.PL1WaterLevelAtRiver); + Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.PL1WaterLevelAtPolder); + Assert.AreEqual(DataSourceTypeSensors.Ignore, sensorLocation.PL3); + Assert.AreEqual(DataSourceTypeSensors.LocationData, sensorLocation.PL4); + Assert.AreEqual(-1.33, sensorLocation.PolderLevel, cTolerance); + Assert.AreEqual(0.8, sensorLocation.HeadPl3, cTolerance); + Assert.AreEqual(0.8, sensorLocation.HeadPl4, cTolerance); // Test data for the second sensor - var currentSensor = sensorData.Sensors.FirstOrDefault(s => s.ID.Equals(10)); + var currentSensor = sensorLocation.Sensors.FirstOrDefault(s => s.ID.Equals(10)); Assert.AreEqual("AS452", currentSensor.Name); Assert.AreEqual(121.1, currentSensor.RelativeLocation, cTolerance); Assert.AreEqual(-0.63, currentSensor.Depth, cTolerance); Index: DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 1598) @@ -121,11 +121,11 @@ }) using (var location = new Location("test") { RiverLevel = 1, PolderLevel = 1 }) { - location.AddNewSensorData(); - location.SensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; + location.AddNewSensorLocation(); + location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; // create dike with ditch @@ -170,7 +170,7 @@ {sensor7, 1}, }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; var creator = new SensorPLLine1Creator(sensorLocation, sensorValues); @@ -225,11 +225,11 @@ }) using (var location = new Location("test") { RiverLevel = 5, PolderLevel = polderLevel }) { - location.AddNewSensorData(); - location.SensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; + location.AddNewSensorLocation(); + location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; // create dike with ditch @@ -264,7 +264,7 @@ {sensor4, 1}, }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; var creator = new SensorPLLine1Creator(sensorLocation, sensorValues); @@ -289,11 +289,11 @@ }) using (var location = new Location("test") { RiverLevel = 5, PolderLevel = -1 }) { - location.AddNewSensorData(); - location.SensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; - location.SensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor; + location.AddNewSensorLocation(); + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Sensor; surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside); surfaceLine.EnsurePointOfType(50.0, 0.0, CharacteristicPointType.DikeToeAtRiver); @@ -326,7 +326,7 @@ {sensor4, 1}, }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; var creator = new SensorPLLine1Creator(sensorLocation, sensorValues); @@ -357,10 +357,10 @@ surfaceLine.EnsurePointOfType(20, 0.0, CharacteristicPointType.DitchPolderSide); surfaceLine.EnsurePointOfType(25, 0.0, CharacteristicPointType.SurfaceLevelInside); - location.AddNewSensorData(); + location.AddNewSensorLocation(); location.SurfaceLine2 = surfaceLine; - var creator = new SensorPLLine1Creator(location.SensorData, new Dictionary()); + var creator = new SensorPLLine1Creator(location.SensorLocation, new Dictionary()); var actual = creator.GetDitchWaterLevelIntersectionAtXDikeSide(-2.5); const double expected = 12.5; Assert.AreEqual(expected, actual); @@ -378,15 +378,15 @@ }) using (var location = new Location("test") { RiverLevel = 1, PolderLevel = 1 }) { - location.AddNewSensorData(); - location.SensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - location.SensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; - location.SensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + location.AddNewSensorLocation(); + location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; - Assert.IsTrue(location.SensorData.IsValid()); + Assert.IsTrue(location.SensorLocation.IsValid()); surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside); surfaceLine.EnsurePointOfType(50.0, 0.0, CharacteristicPointType.DikeToeAtRiver); @@ -427,7 +427,7 @@ {sensor7, 1}, }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; var creator = new SensorPLLine1Creator(sensorLocation, sensorValues); // call @@ -476,15 +476,15 @@ { #region Setup - location.AddNewSensorData(); - location.SensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - location.SensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; - location.SensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + location.AddNewSensorLocation(); + location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; - Assert.IsTrue(location.SensorData.IsValid()); + Assert.IsTrue(location.SensorLocation.IsValid()); surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside); surfaceLine.EnsurePointOfType(50.0, 0.0, CharacteristicPointType.DikeToeAtRiver); @@ -519,7 +519,7 @@ {sensor4, 3}, }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; var creator = new SensorPLLine1Creator(sensorLocation, sensorValues); #endregion @@ -570,16 +570,16 @@ { #region Setup - location.AddNewSensorData(); - location.SensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; - location.SensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + location.AddNewSensorLocation(); + location.SensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; + location.SensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - location.SensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - location.SensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; - Assert.IsTrue(location.SensorData.IsValid()); + Assert.IsTrue(location.SensorLocation.IsValid()); surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside); surfaceLine.EnsurePointOfType(50.0, 0.0, CharacteristicPointType.DikeToeAtRiver); @@ -617,7 +617,7 @@ {sensor5, -1.5} }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; #endregion @@ -657,12 +657,12 @@ }) using (var location = new Location("test") { RiverLevel = waterLevel, PolderLevel = waterLevel }) { - location.AddNewSensorData(); - location.SensorData.PL3 = DataSourceTypeSensors.Sensor; - location.SensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; - location.SensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + location.AddNewSensorLocation(); + location.SensorLocation.PL3 = DataSourceTypeSensors.Sensor; + location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.LocationData; + location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; - Assert.IsTrue(location.SensorData.IsValid()); + Assert.IsTrue(location.SensorLocation.IsValid()); surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside); surfaceLine.EnsurePointOfType(xDikeToeAtRiver, 0.0, CharacteristicPointType.DikeToeAtRiver); @@ -695,7 +695,7 @@ {sensor7, waterLevel}, }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; var creator = new SensorPLLine3Creator(sensorLocation, sensorValues); // call @@ -727,12 +727,12 @@ }) using (var location = new Location("test") { RiverLevel = 1.0, PolderLevel = 1.0 }) { - location.AddNewSensorData(); - location.SensorData.PL3 = DataSourceTypeSensors.Sensor; - location.SensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - location.SensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + location.AddNewSensorLocation(); + location.SensorLocation.PL3 = DataSourceTypeSensors.Sensor; + location.SensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + location.SensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; - Assert.IsTrue(location.SensorData.IsValid()); + Assert.IsTrue(location.SensorLocation.IsValid()); surfaceLine.EnsurePointOfType(0.0, 0.0, CharacteristicPointType.SurfaceLevelOutside); surfaceLine.EnsurePointOfType(xDikeToeAtRiver, 0.0, CharacteristicPointType.DikeToeAtRiver); @@ -765,7 +765,7 @@ {sensor7, 1}, }; - var sensorLocation = location.SensorData; + var sensorLocation = location.SensorLocation; var creator = new SensorPLLine3Creator(sensorLocation, sensorValues); // call Index: DamClassic/trunk/src/Dam/Data/Location.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Data/Location.cs (.../Location.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Data/Location.cs (.../Location.cs) (revision 1598) @@ -222,7 +222,7 @@ private double scenarioRiverLevel = 0; private double? scenarioRiverLevelLow = null; private Segment segment; - private SensorLocation sensorData; + private SensorLocation sensorLocation; private double sheetPileLength = 0; private GeometryPoint sheetPilePoint = new GeometryPoint(); private string shoulderEmbankmentMaterial = ""; @@ -277,25 +277,25 @@ this.name = name; } - public bool HasSensorData + public bool HasSensorLocation { get { - return sensorData != null; + return sensorLocation != null; } } [Browsable(false)] - public virtual SensorLocation SensorData + public virtual SensorLocation SensorLocation { get { - return sensorData; + return sensorLocation; } set { - sensorData = value; - sensorData.Location = this; + sensorLocation = value; + sensorLocation.Location = this; } } @@ -2965,10 +2965,10 @@ } } - public void AddNewSensorData() + public void AddNewSensorLocation() { var factory = new SensorFactory(); - SensorData = factory.CreateSensorLocation(this); + SensorLocation = factory.CreateSensorLocation(this); } [Validate] Index: DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs =================================================================== diff -u -r1106 -r1598 --- DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1106) +++ DamClassic/trunk/src/Dam/Tests/DamLiveIntegrationTest.cs (.../DamLiveIntegrationTest.cs) (revision 1598) @@ -270,43 +270,43 @@ var location0 = locations[0]; var repository = new SensorRepository(location0); repository.Add(new[] { sensor1, sensor2, sensor3, sensor4, sensor5, sensor6, sensor7 }); - var sensorData = location0.SensorData; - sensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; - sensorData.PL3 = DataSourceTypeSensors.Sensor; - sensorData.PL4 = DataSourceTypeSensors.Sensor; + var sensorLocation = location0.SensorLocation; + sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.Ignore; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.PL3 = DataSourceTypeSensors.Sensor; + sensorLocation.PL4 = DataSourceTypeSensors.Sensor; //location0.Name = "dwp 31,5"; var location1 = locations[1]; repository = new SensorRepository(location1); repository.Add(new[] { sensor1, sensor8, sensor9, sensor10 }); - sensorData = location1.SensorData; - sensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; - sensorData.PL3 = DataSourceTypeSensors.Sensor; - sensorData.PL4 = DataSourceTypeSensors.Sensor; + sensorLocation = location1.SensorLocation; + sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; + sensorLocation.PL3 = DataSourceTypeSensors.Sensor; + sensorLocation.PL4 = DataSourceTypeSensors.Sensor; //location1.Name = "dwp 34,0"; var location2 = locations[2]; repository = new SensorRepository(location2); repository.Add(new[] { sensor1, sensor11, sensor12, sensor13, sensor14, sensor15 }); - sensorData = location2.SensorData; - sensorData.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; - sensorData.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; - sensorData.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; - sensorData.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; - sensorData.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; - sensorData.PL3 = DataSourceTypeSensors.Sensor; - sensorData.PL4 = DataSourceTypeSensors.Sensor; + sensorLocation = location2.SensorLocation; + sensorLocation.PL1WaterLevelAtRiver = DataSourceTypeSensors.Sensor; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtRiver = DataSourceTypeSensors.LocationData; + sensorLocation.PL1PLLineOffsetBelowDikeTopAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.PL1PLLineOffsetBelowShoulderBaseInside = DataSourceTypeSensors.Ignore; + sensorLocation.PL1PLLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.Ignore; + sensorLocation.PL1WaterLevelAtPolder = DataSourceTypeSensors.Sensor; + sensorLocation.PL3 = DataSourceTypeSensors.Sensor; + sensorLocation.PL4 = DataSourceTypeSensors.Sensor; //location2.Name = "dwp 37,0"; #endregion Index: DamClassic/trunk/src/Dam/Data/Sensors/SensorRepository.cs =================================================================== diff -u -r874 -r1598 --- DamClassic/trunk/src/Dam/Data/Sensors/SensorRepository.cs (.../SensorRepository.cs) (revision 874) +++ DamClassic/trunk/src/Dam/Data/Sensors/SensorRepository.cs (.../SensorRepository.cs) (revision 1598) @@ -19,12 +19,12 @@ public SensorRepository(Location location) : this() { - if (location.SensorData == null) + if (location.SensorLocation == null) { - location.AddNewSensorData(); + location.AddNewSensorLocation(); } - sensorLocation = location.SensorData; + sensorLocation = location.SensorLocation; if (sensorLocation.Group == null) sensorLocation.Group = new Group();