Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r6436 -r6727 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 6727) @@ -130,45 +130,6 @@ } } - public object ImportWithDefinitionFile(string fileName, DamProjectType damProjectType, ProgressDelegate progress) - { - DataSourceContainer dataSourceContainer = DataSourceContainer.Deserialize(fileName); - ProjectFileName = fileName; - string definitionFileProjectFolder = Path.GetDirectoryName(fileName); - - List logMessages; - - // import - WaterBoard waterBoard = WaterBoardImporter.ImportAllData( - definitionFileProjectFolder, dataSourceContainer, damProjectType, - progress, out logMessages); - //var importer = new WaterBoardImporter(); - //var waterBoard = importer.ImportAllData( - // definitionFileProjectFolder, dataSourceContainer, progress); - //logMessages = importer.importLogMessages.ToList(); - - // create data - DamProjectData = new DamProjectData - { - WaterBoard = waterBoard - }; - - // handle log messages - if (logMessages.Count > 0) - { - LogManager.Messages.AddRange(logMessages); - } - - // Add stability as standard mechanism when not yet available. - if (damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Count == 0) - { - damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications - .Add(new DamFailureMechanismeCalculationSpecification()); - } - - return DamProjectData; - } - /// /// Imports all the data /// Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs =================================================================== diff -u -r6713 -r6727 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 6713) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 6727) @@ -87,26 +87,6 @@ } /// - /// Imports all data. - /// - /// The data folder. - /// The data source container. - /// Type of the dam project. - /// The progress. - /// The log messages. - /// - public static WaterBoard ImportAllData(string dataFolder, - DataSourceContainer dataSourceContainer, DamProjectType damProjectType, ProgressDelegate progress, - out List logMessages) - { - DataPluginImporter importer = CreateDataPlugin(dataFolder, dataSourceContainer); - IEnumerable dikeRingIds = importer.GetDikeRingIdList(); - WaterBoard waterboard = ImportDataForDikeRings("", dataFolder, dataSourceContainer, - dikeRingIds, damProjectType, progress, out logMessages); - return waterboard; - } - - /// /// Imports the data for dike rings. /// /// The dam project folder. Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r6436 -r6727 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 6727) @@ -37,87 +37,10 @@ [TestFixture] public class WaterBoardImporterTests { - private readonly string directoryWithCsvFiles = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\GrootSallandBinnenwaarts\"); private DataPluginImporter dataPluginImporter; private DataSourceContainer dataSourceContainer; [Test] - public void WaterBoardImportedWithCsvFilesHasValidData() - { - const string soilKleiDuin = "klei duin"; - const string soilProfileId = "10Z_275_STBI_p"; - const string segmentId = "segment_dijkring10_dwp02_4"; - const string surfacelineId = "dijkring10_dwp40_0"; - const string locationId = "dwp04_1"; - const double cTolerance = 0.00001; - const double cToleranceCoordinate = 0.00001; - SetupForCsvFilesImport(); - using WaterBoard waterBoard = WaterBoardImporter.ImportAllData("", dataSourceContainer, - DamProjectType.Calamity, null, out List _); - // Check Dike - Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1)); - Dike dike = waterBoard.Dikes[0]; - - //Check Soils - // ToDO For now expect 0 as the soildb for this test has not yet been replaced with a soils.csv - Assert.That(dike.SoilList.Soils.Count, Is.EqualTo(0)); - // Assert.AreEqual(47, dike.SoilList.Soils.Count); - // Soil soil = dike.SoilList.Soils[dike.SoilList.GetSoilIndexByName(soilKleiDuin)]; - // Assert.AreEqual(15.7, soil.AbovePhreaticLevel, cTolerance); - - // Check Soilprofiles - Assert.That(dike.SoilProfiles.Count, Is.EqualTo(26)); - SoilProfile1D soilProfile = dike.SoilProfiles.First(x => x.Name.Equals(soilProfileId)); - Assert.That(soilProfile.Layers[0].Soil.Name, Is.EqualTo(soilKleiDuin)); - - // Check Segments - Assert.That(waterBoard.Segments.Count, Is.EqualTo(24)); - Segment segment = waterBoard.Segments.First(x => x.Name.Equals(segmentId)); - Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.stix")); - Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(100.0).Within(cTolerance)); - Assert.That(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType - .Equals(FailureMechanismSystemType.StabilityInside), Is.True); - // Check segment with stability and piping - segment = waterBoard.Segments.FirstOrDefault(x => x.Name.Equals("segment_dijkring10_dwp02_4")); - Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.stix")); - Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(100.0).Within(cTolerance)); - Assert.That(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType - .Equals(FailureMechanismSystemType.StabilityInside), Is.True); - Assert.That(segment.SoilProfileProbabilities[1].SoilGeometryName, Is.EqualTo("10Y_024_STBI.stix")); - Assert.That(segment.SoilProfileProbabilities[1].Probability, Is.EqualTo(100.0).Within(cTolerance)); - Assert.That(segment.SoilProfileProbabilities[1].SegmentFailureMechanismType - .Equals(FailureMechanismSystemType.Piping), Is.True); - - // Check surfacelines - Assert.That(dike.SurfaceLines2.Count, Is.EqualTo(13)); - SurfaceLine2 surfaceline = dike.SurfaceLines2.First(x => x.Name.Equals(surfacelineId)); - Assert.That(surfaceline.Geometry.Points.Any(), Is.True); - Assert.That(surfaceline.Geometry.Points[0].X, Is.EqualTo(0.0).Within(cToleranceCoordinate)); - Assert.That(surfaceline.Geometry.Points[0].Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); - Assert.That(surfaceline.Geometry.Points[0].Z, Is.EqualTo(-0.48).Within(cToleranceCoordinate)); - int lastPointIndex = surfaceline.Geometry.Count - 1; - Assert.That(surfaceline.Geometry.Points[lastPointIndex].X, Is.EqualTo(71.25).Within(cToleranceCoordinate)); - Assert.That(surfaceline.Geometry.Points[lastPointIndex].Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); - Assert.That(surfaceline.Geometry.Points[lastPointIndex].Z, Is.EqualTo(-0.36).Within(cToleranceCoordinate)); - - GeometryPoint point = surfaceline.CharacteristicPoints.GetGeometryPoint( - CharacteristicPointType.SurfaceLevelInside); - Assert.That(point.X, Is.EqualTo(71.25).Within(cToleranceCoordinate)); - Assert.That(point.Y, Is.EqualTo(0.0).Within(cToleranceCoordinate)); - Assert.That(point.Z, Is.EqualTo(-0.36).Within(cToleranceCoordinate)); - - // Check locations - Assert.That(dike.Locations.Count, Is.EqualTo(13)); - Location location = dike.Locations.First(x => x.Name.Equals(locationId)); - // Assert.AreEqual(0.25, location.MinimalCircleDepth, cTolerance); // is default from modelparameters - - Assert.That(location.Segment.Name, Is.EqualTo("segment_dijkring10_dwp04_1")); - Assert.That(location.SurfaceLine2.Name, Is.EqualTo("dijkring10_dwp04_1")); - - dike.Validate(); - } - - [Test] public void ImportWaterBoardOnlyCsvFiles1D() { const double cTolerance = 0.0001; @@ -517,22 +440,4 @@ Assert.That(dike.Locations[1].ForbiddenZoneFactor, Is.EqualTo(0.9).Within(cTolerance)); } } - - private void SetupForCsvFilesImport() - { - var srcDataSources = new List - { - new() - { - DataSourceType = DataSourceType.CsvFiles, - DataLocation = directoryWithCsvFiles - } - }; - dataPluginImporter = new DataPluginImporter(); - dataPluginImporter.SetDataSources("", srcDataSources); - dataSourceContainer = new DataSourceContainer - { - DataSourceList = srcDataSources - }; - } } \ No newline at end of file