Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r4205 -r4283 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 4205) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 4283) @@ -62,17 +62,18 @@ List filteredJobs = FilterLocationJobsWithSoilProfiles(damProjectData.SelectedLocationJobs, soilProfileDirectory, dike.SoilList, - soilProfiles2DToSerialize) - .ToList(); + soilProfiles2DToSerialize).ToList(); List filteredLocations = filteredJobs.Select(loc => loc.Location).ToList(); ValidateDamProjectData(damProjectData, filteredLocations); - var input = new Input(); - input.ProjectPath = damProjectData.ProjectPath; - input.CalculationMap = damProjectData.CalculationMap; - input.MaxCalculationCoresSpecified = true; - input.MaxCalculationCores = damProjectData.MaxCalculationCores; + var input = new Input + { + ProjectPath = damProjectData.ProjectPath, + CalculationMap = damProjectData.CalculationMap, + MaxCalculationCoresSpecified = true, + MaxCalculationCores = damProjectData.MaxCalculationCores + }; TransferAnalysisSpecification(damProjectData, input); TransferStabilityParameters(damProjectData, input); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs =================================================================== diff -u -r4070 -r4283 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs (.../FillDamUiFromXmlHelper.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlHelper.cs (.../FillDamUiFromXmlHelper.cs) (revision 4283) @@ -27,7 +27,7 @@ namespace Deltares.Dam.Data.DamEngineIo; -public class FillDamUiFromXmlHelper +public abstract class FillDamUiFromXmlHelper { public static SurfaceLine2 ConvertXmlSurfaceLineToSurfaceLine2(SurfaceLine inputSurfaceLine) { Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r4236 -r4283 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4236) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 4283) @@ -50,8 +50,8 @@ [TestFixture] public class FillXmlInputFromDamUiTests { - const AnalysisType ExpectedAnalysisType = AnalysisType.AdaptGeometry; - const AnalysisType NotExpectedAnalysisType = AnalysisType.NoAdaption; + private const AnalysisType expectedAnalysisType = AnalysisType.AdaptGeometry; + private const AnalysisType notExpectedAnalysisType = AnalysisType.NoAdaption; [Test] public void CanWriteAndReadDamProjectDataToXmlFile() @@ -65,7 +65,7 @@ DamXmlSerialization.SaveInputAsXmlFile(inputFilename, input); // Init static that is to be loaded with not expected value - DamProjectCalculationSpecification.SelectedAnalysisType = NotExpectedAnalysisType; + DamProjectCalculationSpecification.SelectedAnalysisType = notExpectedAnalysisType; // Load input file input = DamXmlSerialization.LoadInputFromXmlFile(inputFilename); @@ -85,7 +85,7 @@ string inputXml = DamXmlSerialization.SaveInputAsXmlString(input); // Init static that is to be loaded with not expected value - DamProjectCalculationSpecification.SelectedAnalysisType = NotExpectedAnalysisType; + DamProjectCalculationSpecification.SelectedAnalysisType = notExpectedAnalysisType; // Load input string input = DamXmlSerialization.LoadInputFromXmlString(inputXml); @@ -609,9 +609,8 @@ location.Name = id; // When Writing Xml - string xmlString; Input input = FillXmlInputFromDamUi.CreateInput(expectedDamProjectData); - xmlString = DamXmlSerialization.SaveInputAsXmlString(input); + string xmlString = DamXmlSerialization.SaveInputAsXmlString(input); // Then Raise Exception With Clear Message() input = DamXmlSerialization.LoadInputFromXmlString(xmlString); @@ -707,22 +706,22 @@ { Config = { - MaxDifferences = 10 + MaxDifferences = 10, + MembersToIgnore = new List + { + "SheetPilePoint", + "SheetPilePointX", + "SheetPilePointY", + "SheetPilePointZ", + "LocalXZSheetPilePoint", + "WaterBoardJob", + "LocationJobs", + "SelectedLocationJobs", + "PickSensors", + "MapForSoilGeometries2D" + } } }; - compare.Config.MembersToIgnore = new List - { - "SheetPilePoint", - "SheetPilePointX", - "SheetPilePointY", - "SheetPilePointZ", - "LocalXZSheetPilePoint", - "WaterBoardJob", - "LocationJobs", - "SelectedLocationJobs", - "PickSensors", - "MapForSoilGeometries2D" - }; ComparisonResult result = compare.Compare(expected, actual); Assert.AreEqual(0, result.Differences.Count, "Differences found read/write Input object:" + result.DifferencesString); @@ -924,7 +923,7 @@ damProjectData.InputTimeSerieCollection = new TimeSerieCollection(); for (var i = 0; i < timeSeriesCount; i++) { - string locationId = String.Format("location{0}", i); + string locationId = $"location{i}"; TimeSerie timeSerie = damProjectData.InputTimeSerieCollection.AddNewSeries(locationId); timeSerie.ParameterId = (i % 2 == 0) ? idWaterLevel : idWaterPressure; timeSerie.ForecastDateTime = DateTime.Now; @@ -933,13 +932,13 @@ timeSerie.EndDateTime = new DateTime(2012, 12, 31, 1, 0, 0); timeSerie.MissVal = -9999.0; timeSerie.LongName = timeSerie.LocationId + "long"; - timeSerie.StationName = String.Format("station{0}", i); + timeSerie.StationName = $"station{i}"; timeSerie.Units = "m"; - timeSerie.SourceOrganisation = String.Format("organisation{0}", i); - timeSerie.SourceSystem = String.Format("system{0}", i); - timeSerie.FileDescription = String.Format("filedescription{0}", i); - timeSerie.Region = String.Format("region{0}", i); - if ((i % 2 == 0)) + timeSerie.SourceOrganisation = $"organisation{i}"; + timeSerie.SourceSystem = $"system{i}"; + timeSerie.FileDescription = $"filedescription{i}"; + timeSerie.Region = $"region{i}"; + if (i % 2 == 0) { timeSerie.TimeStep.Multiplier = 3600; timeSerie.TimeStep.Unit = TimeStepUnit.Second; @@ -963,8 +962,8 @@ DateTime = new DateTime(2012, 12, 31, 1, j * 10, 0), Value = j, Flag = 1, - BasisFileName = String.Format("BasisFileName{0}", i), - RelativeCalculationPathName = String.Format("RelativeCalculationPathName{0}", i), + BasisFileName = $"BasisFileName{i}", + RelativeCalculationPathName = $"RelativeCalculationPathName{i}", StochastValue = stochastValue }); } @@ -975,7 +974,7 @@ { damProjectData.DamProjectType = DamProjectType.Design; damProjectData.DamProjectCalculationSpecification = new DamProjectCalculationSpecification(); - DamProjectCalculationSpecification.SelectedAnalysisType = ExpectedAnalysisType; + DamProjectCalculationSpecification.SelectedAnalysisType = expectedAnalysisType; var calculationSpecification = new DamFailureMechanismeCalculationSpecification { FailureMechanismSystemType = FailureMechanismSystemType.Piping, @@ -1025,7 +1024,7 @@ { var soil = new Soil { - Name = String.Format("Soil {0}", i) + Name = $"Soil {i}" }; soil.AbovePhreaticLevel = 7 + 0.1 * i; @@ -1116,29 +1115,30 @@ private static Scenario FillDesignScenario(int locationIndex, int designScenarioIndex) { int factor = locationIndex * designScenarioIndex; - var designScenario = new Scenario(); - designScenario.LocationScenarioID = (designScenarioIndex + 1).ToString(); - designScenario.RiverLevel = 1.0 * factor + 0.51; - designScenario.RiverLevelLow = 1.0 * factor + 0.52; - designScenario.DikeTableHeight = 1.0 * factor + 0.53; - designScenario.PlLineOffsetBelowDikeTopAtRiver = 1.0 * factor + 0.54; - designScenario.PlLineOffsetBelowDikeTopAtPolder = 1.0 * factor + 0.55; - designScenario.PlLineOffsetBelowShoulderBaseInside = 1.0 * factor + 0.56; - designScenario.PlLineOffsetBelowDikeToeAtPolder = 1.0 * factor + 0.57; - designScenario.PlLineOffsetBelowDikeCrestMiddle = 1.0 * factor + 0.58; - designScenario.UsePlLineOffsetBelowDikeCrestMiddle = true; - designScenario.PlLineOffsetFactorBelowShoulderCrest = 1.0 * factor + 0.59; - designScenario.UsePlLineOffsetFactorBelowShoulderCrest = true; - designScenario.HeadPl3 = 1.0 * factor + 0.60; - designScenario.HeadPl4 = 1.0 * factor + 0.61; - designScenario.UpliftCriterionStability = 1.0 * factor + 0.62; - designScenario.UpliftCriterionPiping = 1.0 * factor + 0.63; - designScenario.RequiredSafetyFactorStabilityInnerSlope = 1.0 * factor + 0.64; - designScenario.RequiredSafetyFactorStabilityOuterSlope = 1.0 * factor + 0.65; - designScenario.RequiredSafetyFactorPiping = 1.0 * factor + 0.66; - designScenario.PolderLevel = 1.0 * factor + 0.67; - designScenario.HeadPl2 = 1.0 * factor + 0.68; - return designScenario; + return new Scenario + { + LocationScenarioID = (designScenarioIndex + 1).ToString(), + RiverLevel = 1.0 * factor + 0.51, + RiverLevelLow = 1.0 * factor + 0.52, + DikeTableHeight = 1.0 * factor + 0.53, + PlLineOffsetBelowDikeTopAtRiver = 1.0 * factor + 0.54, + PlLineOffsetBelowDikeTopAtPolder = 1.0 * factor + 0.55, + PlLineOffsetBelowShoulderBaseInside = 1.0 * factor + 0.56, + PlLineOffsetBelowDikeToeAtPolder = 1.0 * factor + 0.57, + PlLineOffsetBelowDikeCrestMiddle = 1.0 * factor + 0.58, + UsePlLineOffsetBelowDikeCrestMiddle = true, + PlLineOffsetFactorBelowShoulderCrest = 1.0 * factor + 0.59, + UsePlLineOffsetFactorBelowShoulderCrest = true, + HeadPl3 = 1.0 * factor + 0.60, + HeadPl4 = 1.0 * factor + 0.61, + UpliftCriterionStability = 1.0 * factor + 0.62, + UpliftCriterionPiping = 1.0 * factor + 0.63, + RequiredSafetyFactorStabilityInnerSlope = 1.0 * factor + 0.64, + RequiredSafetyFactorStabilityOuterSlope = 1.0 * factor + 0.65, + RequiredSafetyFactorPiping = 1.0 * factor + 0.66, + PolderLevel = 1.0 * factor + 0.67, + HeadPl2 = 1.0 * factor + 0.68 + }; } private List CreateSurfaceLines() @@ -1148,7 +1148,7 @@ for (var i = 0; i < surfaceLineCount; i++) { var surfaceLine = new SurfaceLine2(); - surfaceLine.Name = String.Format("SurfaceLine {0}", i); + surfaceLine.Name = $"SurfaceLine {i}"; surfaceLine.CharacteristicPoints.Geometry = surfaceLine.Geometry; AddPointsToSurfaceLines(surfaceLine); surfaceLines.Add(surfaceLine); @@ -1186,9 +1186,11 @@ const int profilesCount = 2; for (var i = 0; i < profilesCount; i++) { - var profile = new SoilProfile1D(); - profile.Name = "Profile1D " + (i + 1); - profile.BottomLevel = -21.12 * (i + 1); + var profile = new SoilProfile1D + { + Name = "Profile1D " + (i + 1), + BottomLevel = -21.12 * (i + 1) + }; const int layerCount = 3; for (var j = 0; j < layerCount; j++) { @@ -1222,8 +1224,10 @@ Dike dike = damProjectData.WaterBoard.Dikes[0]; for (var i = 0; i < segmentCount; i++) { - var segment = new Segment(); - segment.Name = "Segment " + i; + var segment = new Segment + { + Name = "Segment " + i + }; var soilProfileProbability = new SoilGeometryProbability(); if (i == 0) {