Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs =================================================================== diff -u -r1575 -r1714 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1575) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesAssessmentRegional/RegionalScenariosCalculation.cs (.../RegionalScenariosCalculation.cs) (revision 1714) @@ -635,7 +635,6 @@ private void CombineProfiles(RegionalScenarioResult scenarioResult) { // combine results of profiles - scenarioResult.SafetyFactor = Double.MaxValue; foreach (var profileResult in scenarioResult.RegionalScenarioProfileResults) { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs =================================================================== diff -u -r1616 -r1714 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamProjectData.cs) (revision 1616) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamProjectData.cs) (revision 1714) @@ -119,7 +119,7 @@ { get { - return dike; + return dike; } set { @@ -138,7 +138,7 @@ set { damProjectCalculationSpecification = value; } } - + public virtual DamJob DikeJob { get @@ -179,8 +179,8 @@ if (modified) { - LocationJob.DamProjectType = damProjectType; - } + LocationJob.DamProjectType = damProjectType; + } } } @@ -217,7 +217,7 @@ foreach (LocationJob locationJob in dikeJob.Jobs) { jobs.Add(locationJob); - } + } } return jobs; } @@ -249,7 +249,7 @@ public string CalculationMap { get { return calculationMap; } - set { calculationMap = value?? ""; } + set { calculationMap = value ?? ""; } } /// @@ -258,7 +258,8 @@ /// /// The maximum calculation cores. /// - public int MaxCalculationCores { + public int MaxCalculationCores + { get { return maxCalculationCores; @@ -305,44 +306,5 @@ { return Name; } - - - /// - /// Fills the overall sensor data. - /// - public void FillOverallSensorData() - { - if (sensorData != null) - { - sensorData.Sensors.Clear(); - sensorData.SensorGroups.Clear(); - sensorData.SensorLocations.Clear(); - } - else - { - sensorData = new SensorData(); - } - foreach (var location in dike.Locations) - { - var sensorLocation = location.SensorLocation; - - foreach (var sensor in sensorLocation.Sensors ) - { - if (sensorData.GetSensorById(sensor.ID) == null) - { - sensorData.Sensors.Add(sensor); - } - } - if (sensorData.GetGroupById(sensorLocation.SensorGroup.ID) == null && sensorLocation.SensorGroup.ID >= 0) - { - sensorLocation.SensorGroup.PickSensors = sensorData.Sensors; - sensorData.SensorGroups.Add(sensorLocation.SensorGroup); - } - if (sensorData.GetSensorLocationByLocationName(sensorLocation.LocationName) == null) - { - sensorData.SensorLocations.Add(sensorLocation); - } - } - } } }