Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/Deltares.LayerOnSlopeTool.ImporterTests.csproj =================================================================== diff -u -r3131 -r3140 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/Deltares.LayerOnSlopeTool.ImporterTests.csproj (.../Deltares.LayerOnSlopeTool.ImporterTests.csproj) (revision 3131) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/Deltares.LayerOnSlopeTool.ImporterTests.csproj (.../Deltares.LayerOnSlopeTool.ImporterTests.csproj) (revision 3140) @@ -48,12 +48,19 @@ + Copying.AGPL.licenseheader + + + {ebc22fc1-bf8a-49b0-9427-cffcef570ab2} + Deltares.LayerOnSlopeTool.Importer + + \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/CsvImportersTests.cs =================================================================== diff -u --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/CsvImportersTests.cs (revision 0) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.ImporterTests/CsvImportersTests.cs (revision 3140) @@ -0,0 +1,251 @@ +// Copyright (C) Stichting Deltares 2020. All rights reserved. +// +// This file is part of the LayerOnSlopeTool +// +// The LayerOnSlopeTool is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Deltares.LayerOnSlopeTool.Data.CsvImporters; +using NUnit.Framework; + +namespace Deltares.LayerOnSlopeTool.Io.Tests +{ + [TestFixture] + public class CsvImportersTests + { + private string importFolder; + + /// + /// Setup for whole testfixture + /// + [TestFixtureSetUp] + public void FixtureSetup() + { + importFolder = Path.Combine(Directory.GetCurrentDirectory(), "TmpImportFiles"); + } + + /// + /// Setup for single test + /// + [SetUp] + public void Setup() + { + if (!Directory.Exists(importFolder)) + Directory.CreateDirectory(importFolder); + } + + [Test] + public void CharacteristicPointsImporterCorrectFileTest() + { + const string importFile = "characteristicpoints.csv"; + string testFilePath = Path.Combine(importFolder, importFile); + if (File.Exists(testFilePath)) + File.Delete(testFilePath); + CreateCharacteristicPointsFile(testFilePath); + CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(testFilePath); + IList characteristicPointsRecords = csvImporterCharacteristicPoints.ImportedItems; + CheckCharacteristicPoints(characteristicPointsRecords); + } + + [Test] + public void CharacteristicPointsWithLocationIdImporterCorrectFileTest() + { + const string importFile = "characteristicpoints.csv"; + string testFilePath = Path.Combine(importFolder, importFile); + if (File.Exists(testFilePath)) + File.Delete(testFilePath); + CreateCharacteristicPointsFileWithLocationId(testFilePath); + CsvImporterCharacteristicPoints csvImporterCharacteristicPoints = new CsvImporterCharacteristicPoints(testFilePath); + IList characteristicPointsRecords = csvImporterCharacteristicPoints.ImportedItems; + CheckCharacteristicPoints(characteristicPointsRecords); + } + + private static void CreateCharacteristicPointsFile(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "Profielnaam;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer"); + writer.WriteLine( + "D1;117.94;0;0.12;-1;-1;-1;73.99;0;-1.0;72.55;0;-1.46;67.9;0;1.07;63.31;0;1.36;-1;-1;-1;-1;-1;-1;55.17;0;4.46;54.25;0;4.69;51.75;0;4.662;50.11;0;4.46;40.48;0;1.94;32.21;0;1.67;31.6;0;1.3;0;0;0.68;52.63;0;4.77;1"); + } + } + + private static void CheckCharacteristicPoints(IList characteristicPointsRecords) + { + Assert.AreEqual("D1", characteristicPointsRecords[0].SurfaceLineId); + Assert.AreEqual(1, characteristicPointsRecords[0].Volgnummer); + + Assert.AreEqual(117.94, characteristicPointsRecords[0].Points[0].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[0].Y); + Assert.AreEqual(0.12, characteristicPointsRecords[0].Points[0].Z); + + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[1].X); + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[1].Y); + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[1].Z); + + Assert.AreEqual(73.99, characteristicPointsRecords[0].Points[2].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[2].Y); + Assert.AreEqual(-1.0, characteristicPointsRecords[0].Points[2].Z); + + Assert.AreEqual(72.55, characteristicPointsRecords[0].Points[3].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[3].Y); + Assert.AreEqual(-1.46, characteristicPointsRecords[0].Points[3].Z); + + Assert.AreEqual(67.9, characteristicPointsRecords[0].Points[4].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[4].Y); + Assert.AreEqual(1.07, characteristicPointsRecords[0].Points[4].Z); + + Assert.AreEqual(63.31, characteristicPointsRecords[0].Points[5].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[5].Y); + Assert.AreEqual(1.36, characteristicPointsRecords[0].Points[5].Z); + + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[6].X); + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[6].Y); + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[6].Z); + + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[7].X); + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[7].Y); + Assert.AreEqual(-1, characteristicPointsRecords[0].Points[7].Z); + + Assert.AreEqual(55.17, characteristicPointsRecords[0].Points[8].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[8].Y); + Assert.AreEqual(4.46, characteristicPointsRecords[0].Points[8].Z); + + Assert.AreEqual(54.25, characteristicPointsRecords[0].Points[9].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[9].Y); + Assert.AreEqual(4.69, characteristicPointsRecords[0].Points[9].Z); + + Assert.AreEqual(51.75, characteristicPointsRecords[0].Points[10].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[10].Y); + Assert.AreEqual(4.662, characteristicPointsRecords[0].Points[10].Z); + + Assert.AreEqual(50.11, characteristicPointsRecords[0].Points[11].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[11].Y); + Assert.AreEqual(4.46, characteristicPointsRecords[0].Points[11].Z); + + Assert.AreEqual(40.48, characteristicPointsRecords[0].Points[12].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[12].Y); + Assert.AreEqual(1.94, characteristicPointsRecords[0].Points[12].Z); + + Assert.AreEqual(32.21, characteristicPointsRecords[0].Points[13].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[13].Y); + Assert.AreEqual(1.67, characteristicPointsRecords[0].Points[13].Z); + + Assert.AreEqual(31.6, characteristicPointsRecords[0].Points[14].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[14].Y); + Assert.AreEqual(1.3, characteristicPointsRecords[0].Points[14].Z); + + Assert.AreEqual(0, characteristicPointsRecords[0].Points[15].X); + Assert.AreEqual(0, characteristicPointsRecords[0].Points[15].Y); + Assert.AreEqual(0.68, characteristicPointsRecords[0].Points[15].Z); + } + + private static void CreateCharacteristicPointsFileWithLocationId(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "LocationId;X_Maaiveld binnenwaarts;Y_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer"); + writer.WriteLine( + "D1;117.94;0;0.12;-1;-1;-1;73.99;0;-1.0;72.55;0;-1.46;67.9;0;1.07;63.31;0;1.36;-1;-1;-1;-1;-1;-1;55.17;0;4.46;54.25;0;4.69;51.75;0;4.662;50.11;0;4.46;40.48;0;1.94;32.21;0;1.67;31.6;0;1.3;0;0;0.68;52.63;0;4.77;1"); + } + } + + private static void CreateCharacteristicPointsFileWithIllegalHeader(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "Profielnaam;X_Maaiveld binnenwaarts;Z_Maaiveld binnenwaarts;X_Insteek sloot polderzijde;Y_Insteek sloot polderzijde;Z_Insteek sloot polderzijde;X_Slootbodem polderzijde;Y_Slootbodem polderzijde;Z_Slootbodem polderzijde;X_Slootbodem dijkzijde;Y_Slootbodem dijkzijde;Z_Slootbodem dijkzijde;X_Insteek sloot dijkzijde;Y_Insteek_sloot dijkzijde;Z_Insteek sloot dijkzijde;X_Teen dijk binnenwaarts;Y_Teen dijk binnenwaarts;Z_Teen dijk binnenwaarts;X_Kruin binnenberm;Y_Kruin binnenberm;Z_Kruin binnenberm;X_Insteek binnenberm;Y_Insteek binnenberm;Z_Insteek binnenberm;X_Kruin binnentalud;Y_Kruin binnentalud;Z_Kruin binnentalud;X_Verkeersbelasting kant binnenwaarts;Y_Verkeersbelasting kant binnenwaarts;Z_Verkeersbelasting kant binnenwaarts;X_Verkeersbelasting kant buitenwaarts;Y_Verkeersbelasting kant buitenwaarts;Z_Verkeersbelasting kant buitenwaarts;X_Kruin buitentalud;Y_Kruin buitentalud;Z_Kruin buitentalud;X_Insteek buitenberm;Y_Insteek buitenberm;Z_Insteek buitenberm;X_Kruin buitenberm;Y_Kruin buitenberm;Z_Kruin buitenberm;X_Teen dijk buitenwaarts;Y_Teen dijk buitenwaarts;Z_Teen dijk buitenwaarts;X_Maaiveld buitenwaarts;Y_Maaiveld buitenwaarts;Z_Maaiveld buitenwaarts;X_Dijktafelhoogte;Y_Dijktafelhoogte;Z_Dijktafelhoogte;Volgnummer"); + writer.WriteLine( + "D1;117.94;0;0.12;-1;-1;-1;73.99;0;-1.0;72.55;0;-1.46;67.9;0;1.07;63.31;0;1.36;-1;-1;-1;-1;-1;-1;55.17;0;4.46;54.25;0;4.69;51.75;0;4.662;50.11;0;4.46;40.48;0;1.94;32.21;0;1.67;31.6;0;1.3;0;0;0.68;52.63;0;4.77;1"); + } + } + + private static void CreateSurfaceLinesFile(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)"); + writer.WriteLine( + "D1;;63.310;0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.000;1.300;31.730;0.000;1.610;32.210;0.000;1.670;35.580;0.000;1.580;40.480;0.000;1.940;47.860;0.000;3.790;50.110;0.000;4.460;51.750;0.000;4.662;52.630;0.000;4.770;54.250;0.000;4.690;55.170;0.000;4.460;58.850;0.000;2.980;60.290;0.000;2.460;63.310;0.000;1.360;67.900;0.000;1.070;69.410;0.000;0.600;69.800;0.000;0.480;70.530;0.000;0.000;70.820;0.000;-0.190;71.550;0.000;-0.600;72.370;0.000;-1.060;72.380;0.000;-1.170;72.550;0.000;-1.460;73.860;0.000;-1.390;73.990;0.000;-1.0;74.570;0.000;-0.840;74.970;0.000;-0.600;76.170;0.000;0.110;86.660;0.000;0.270;103.280;0.000;0.220;117.940;0.000;0.120"); + writer.WriteLine( + "D2;;63.310;0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.000;1.300;31.730;0.000;1.610"); + } + } + + private static void CreateSurfaceLinesFileWithLocationId(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "LocationId;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)"); + writer.WriteLine( + "D1;;63.310;0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.000;1.300;31.730;0.000;1.610;32.210;0.000;1.670;35.580;0.000;1.580;40.480;0.000;1.940;47.860;0.000;3.790;50.110;0.000;4.460;51.750;0.000;4.662;52.630;0.000;4.770;54.250;0.000;4.690;55.170;0.000;4.460;58.850;0.000;2.980;60.290;0.000;2.460;63.310;0.000;1.360;67.900;0.000;1.070;69.410;0.000;0.600;69.800;0.000;0.480;70.530;0.000;0.000;70.820;0.000;-0.190;71.550;0.000;-0.600;72.370;0.000;-1.060;72.380;0.000;-1.170;72.550;0.000;-1.460;73.860;0.000;-1.390;73.990;0.000;-1.0;74.570;0.000;-0.840;74.970;0.000;-0.600;76.170;0.000;0.110;86.660;0.000;0.270;103.280;0.000;0.220;117.940;0.000;0.120"); + writer.WriteLine( + "D2;;63.310;0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.000;1.300;31.730;0.000;1.610"); + } + } + + private static void CreateSurfaceLinesFileWithIllegalValues(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "Profielnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)"); + writer.WriteLine( + "D1;;AS63.310;Bw0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.0as00;1.300;31.730;0.000;1.610;32.210;0.000;1.670;35.580;0.000;1.580;40.480;0.000;1.940;47.860;0.000;3.790;50.110;0.000;4.460;51.750;0.000;4.662;52.630;0.000;4.770;54.250;0.000;4.690;55.170;0.000;4.460;58.850;0.000;2.980;60.290;0.000;2.460;63.310;0.000;1.360;67.900;0.000;1.070;69.410;0.000;0.600;69.800;0.000;0.480;70.530;0.000;0.000;70.820;0.000;-0.190;71.550;0.000;-0.600;72.370;0.000;-1.060;72.380;0.000;-1.170;72.550;0.000;-1.460;73.860;0.000;-1.390;73.990;0.000;-1.0;74.570;0.000;-0.840;74.970;0.000;-0.600;76.170;0.000;0.110;86.660;0.000;0.270;103.280;0.000;0.220;117.940;0.000;0.120"); + writer.WriteLine( + "D2;;63.310;0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.000;1.300;31.730;0.000;1.610"); + } + } + + private static void CreateSurfaceLinesFileWithIllegalHeaders(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "Proflnaam;Geologischprofiel;X_GridPoint;Y_GridPoint;ScenarioClusterID;X1;Y1;Z1;.....;Xn;Yn;Zn;(Profiel)"); + writer.WriteLine( + "D1;;AS63.310;Bw0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.0as00;1.300;31.730;0.000;1.610;32.210;0.000;1.670;35.580;0.000;1.580;40.480;0.000;1.940;47.860;0.000;3.790;50.110;0.000;4.460;51.750;0.000;4.662;52.630;0.000;4.770;54.250;0.000;4.690;55.170;0.000;4.460;58.850;0.000;2.980;60.290;0.000;2.460;63.310;0.000;1.360;67.900;0.000;1.070;69.410;0.000;0.600;69.800;0.000;0.480;70.530;0.000;0.000;70.820;0.000;-0.190;71.550;0.000;-0.600;72.370;0.000;-1.060;72.380;0.000;-1.170;72.550;0.000;-1.460;73.860;0.000;-1.390;73.990;0.000;-1.0;74.570;0.000;-0.840;74.970;0.000;-0.600;76.170;0.000;0.110;86.660;0.000;0.270;103.280;0.000;0.220;117.940;0.000;0.120"); + writer.WriteLine( + "D2;;63.310;0.000;1;0.000;0.000;0.680;21.110;0.000;1.120;31.600;0.000;1.300;31.730;0.000;1.610"); + } + } + + private static void CreateLocationsFileWithObsoleteColumn(string filePath) + { + using (var writer = File.CreateText(filePath)) + { + writer.WriteLine( + "location_id;surfaceline_id;segment_id;geo_x;geo_y;x_soilgeometry2D_origin;Pl1_id;polderlevel;polderlevellow;head_pl2;head_pl3;head_pl4;Grass_quality;Direction;Ophoogmateriaaldijk;Ophoogmateriaalberm;Sheetpile_x;Sheetpile_y;Sheetpile_z;Sheetpile_length;use_original_plline_assignments;PenetrationLength;TrafficLoad;minimal_circle_depth;dempingsfactor_pl3;dempingsfactor_pl4;PLLineCreationMethod;level_reduction_inside;level_reduction_outside;layer_height_distribution;layer_height_deviation;safety_factor_piping;safety_factor_stability_inner_slope;safety_factor_stability_outer_slope;probability_of_failure_stability_innerslope;probability_of_failure_stability_outerslope;probability_of_failure_piping;uplift_criterion_piping;uplift_criterion_stability;Materiaaltypedijk;bp_tp;bp_hbp;bp_lbp;Baggerdiepte;distance_to_entry_point;PLLineOffsetBelowDikeTopAtRiver;PLLineOffsetBelowDikeTopAtPolder;PLLineOffsetBelowShoulderBaseInside;PLLineOffsetBelowDikeToeAtPolder;PLLineOffsetDryBelowDikeTopAtRiver;PLLineOffsetDryBelowDikeTopAtPolder;PLLineOffsetDryBelowShoulderBaseInside;PLLineOffsetDryBelowDikeToeAtPolder;StabilityShoulderGrowSlope;StabilityShoulderGrowDeltaX;StabilitySlopeAdaptionDeltaX;detrimentfactor;dike_table_height;SlopeDampingPiezometricHeightPolderSide;StabilityDesignMethod;SlopeAdaptionStartCotangent;SlopeAdaptionEndCotangent;SlopeAdaptionStepCotangent; UseNewDikeTopWidth; NewDikeTopWidth;UseNewDikeSlopeInside;NewDikeSlopeInside;UseNewDikeSlopeOutside;NewDikeSlopeOutside;UseNewShoulderTopSlope;NewShoulderTopSlope;UseNewShoulderBaseSlope;NewShoulderBaseSlope;UseNewMaxHeightShoulderAsFraction;NewMaxHeightShoulderAsFraction;UseNewMinDistanceDikeToeStartDitch;NewMinDistanceDikeToeStartDitch;UseNewDitchDefinition;NewWidthDitchBottom;newSlopeAngleDitch;NewDepthDitch;ZoneType;ForbiddenZoneFactor;ZoneAreaRestSlopeCrestWidth;PLLineOffsetBelowDikeCrestMiddle;PLLineOffsetFactorBelowShoulderCrest;UsePLLineOffsetDryBelowDikeCrestMiddle;PLLineOffsetDryBelowDikeCrestMiddle;UsePLLineOffsetDryFactorBelowShoulderCrest;PLLineOffsetDryFactorBelowShoulderCrest;IntrusionVerticalWaterPressure;TL_DegreeOfConsolidation;water_height;water_height_low;water_height_decimerings_hoogte;max_waterheight"); + writer.WriteLine( + "16-1-1-C-3-Z;16-1-1-C-3-Z;1043;124330;441312;1;16-1-1-C-3-Z;0.9;0.2;13.056;0.9;0.8;1;1;klei;klei2;1;2;3;12;TRUE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.01;OptimizedSlopeAndShoulderAdaption;3.0;6.0;0.5;TRUE;1.8;TRUE;1.9;TRUE;2.9;TRUE;2.8;TRUE;2.7;TRUE;0.6;TRUE;2.6;TRUE;1.1;1.2;1.3;NoZones;0.5;1.6;1.0;0.1;TRUE;1.1;FALSE;0.11;Standard;10.1;1.2;1.3;1.4;1.5"); + writer.WriteLine( + "25-2-2-A-1-A;25-2-2-A-1-A;106;66586;424173;2;25-2-2-A-1-A;-0.25;-0.25;0.8727;-0.25;-0.25;1;1;klei;klei2;1;2;3;12;FALSE;1.3;10;1.5;30;40;ExpertKnowledgeRRD;1;2;Uniform;0.1;1.2;1.3;1.4;0.01;0.02;0.03;1.1;1.2;klei;1.0;1.1;1.2;2.0;2.1;0.5;0.6;0.1;0.2;0.6;1.6;0.2;0.3;2.0;0.2;0.5;0.9;3.5;0.2;SlopeAdaptionBeforeShoulderAdaption;4.5;6.5;0.25;FALSE;0.8;FALSE;0.9;FALSE;1.9;FALSE;1.8;FALSE;1.7;FALSE;0.7;FALSE;1.6;FALSE;1.4;1.5;1.6;ForbiddenZone;0.9;2.1; 1.1;0.11;FALSE; 1.0;TRUE;0.1;SemiTimeDependent;55.5;2.2;2.3;2.4;2.5"); + } + } + } +} Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/Deltares.LayerOnSlopeTool.Importer.csproj =================================================================== diff -u -r3131 -r3140 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/Deltares.LayerOnSlopeTool.Importer.csproj (.../Deltares.LayerOnSlopeTool.Importer.csproj) (revision 3131) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Importer/Deltares.LayerOnSlopeTool.Importer.csproj (.../Deltares.LayerOnSlopeTool.Importer.csproj) (revision 3140) @@ -44,12 +44,29 @@ + + + + + + + Copying.AGPL.licenseheader + + + {83d297fb-cfc7-4154-aeb7-5e09e10e24d0} + Deltares.LayerOnSlopeTool.Data + + + {e3b83d68-c90c-4874-8e5f-dec8d038bc7c} + LumenWorks.Framework.IO + + \ No newline at end of file Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/Deltares.LayerOnSlopeTool.Data.csproj =================================================================== diff -u -r3110 -r3140 --- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/Deltares.LayerOnSlopeTool.Data.csproj (.../Deltares.LayerOnSlopeTool.Data.csproj) (revision 3110) +++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/Deltares.LayerOnSlopeTool.Data.csproj (.../Deltares.LayerOnSlopeTool.Data.csproj) (revision 3140) @@ -44,13 +44,6 @@ - - - - - - - @@ -61,11 +54,5 @@ Copying.AGPL.licenseheader - - - {e3b83d68-c90c-4874-8e5f-dec8d038bc7c} - LumenWorks.Framework.IO - - \ No newline at end of file Fisheye: Tag 3140 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterSurfaceLines.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3140 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterLocations.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3140 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CharacteristicPointCsvIdentifiers.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3140 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvReaderUtilities.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3140 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterCharacteristicPoints.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3140 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvImporterHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 3140 refers to a dead (removed) revision in file `DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.Data/CsvImporters/CsvColumnNames.cs'. Fisheye: No comparison available. Pass `N' to diff?