Index: DamClients/DamLive/trunk/lib/DSL-Core/Deltares.Mathematics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Core/Deltares.Standard.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/Deltares.Probabilistic.Calculation.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/MathNet.Numerics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/MathNet.Numerics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/FirebirdSql.Data.FirebirdClient.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Geographic.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Probabilistic.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Core/MathNet.Numerics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/LumenWorks.Framework.IO.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Standard.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/ib_util.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/Deltares.Standard.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Standard.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/icuuc30.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geographic/Deltares.Mathematics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/firebird.msg =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/x86/SQLite.Interop.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Mathematics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Geographic.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/System.Data.SQLite.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/ReleaseNotes.txt =================================================================== diff -u --- DamClients/DamLive/trunk/lib/DSL-Probabilistic/ReleaseNotes.txt (revision 0) +++ DamClients/DamLive/trunk/lib/DSL-Probabilistic/ReleaseNotes.txt (revision 3224) @@ -0,0 +1,48 @@ +r2174 +Release for added setmethod for IValidationResultin DSL Core. +--------------------------------------------------------------- +r1440 +Release 16.1.4.xxx +--------------------- +r1437 +Release binaries DSLProbabilistic +--------------------- +r1434 +Set version to 16.1.4.xxx +--------------------- +r1433 +Set DSLCore lib to 16.1.4 tag +--------------------- +r1430 +Set version to 16.1.4.xxx +--------------------- +r1416 +Page with signatures added Related to Issue [MDNLIB-817] +--------------------- +r1413 +DslProbabilistic internal release Related to Issue [WIUI-142] +--------------------- +r1410 +Reference number removed +--------------------- +r1395 +Release for this issue 1394.142 +--------------------- +r1384 +Release for this Issue. +--------------------- +r1382 +Preparing for 16.1.4 release of DSL Related to Issue [MDNLIB-834] +--------------------- +r1356 +Correct the test report on DSL-Probabilistic - some data were missing. Updated the screenshots. Related to Issue [MDNLIB-824] +--------------------- +r1245 +Commit the new test report on DSL-Probabilistic (covers version 16.1.3.1215) Related to Issue [MDNLIB-824] +--------------------- +r1243 +Correct a minor typo in the name of the files Related to Issue [MNDLIB-824] +--------------------- +r1215 +DslProbabilistic internal release Related to Issue [MDNLIB-798] +--------------------- Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Geotechnics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geographic/Deltares.Geographic.Version.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Mathematics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Geotechnics.IO.Version.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/MathNet.Numerics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Geotechnics.Version.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Core/Deltares.Standard.TestUtils.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/GefBoreUK.dat =================================================================== diff -u --- DamClients/DamLive/trunk/lib/DSL-GeoIO/GefBoreUK.dat (revision 0) +++ DamClients/DamLive/trunk/lib/DSL-GeoIO/GefBoreUK.dat (revision 3224) @@ -0,0 +1,355 @@ +! Datafile for Gef2.dll. +! =========================================================================== +! COMPANY : GeoDelft +! LICENSE : CUR and Delft Cluster +! DATE : 2002-02-28 +! TIME : 12:00:00 +! FILENAME : GefBoreUK.dat +! CREATED BY : GeoDelft and TNO-NITG version 2.0 +! ======================== BEGINNING OF DATA ========================== +[Grondsoort NEN 5104] +G1;slightly gravelly;! +G2;moderately gravelly;! +G3;very gravelly;! +H1;slightly peaty;! +H2;moderately peaty;! +H3;very peaty;! +GS;GRAVEL, silty;! +GZ1;GRAVEL, slightly sandy;! +GZ2;GRAVEL, moderately sandy;! +GZ3;GRAVEL, very sandy;! +GZ4;GRAVEL, extremely sandy;! +KS1;CLAY, slightly silty;! +KS2;CLAY, moderately silty;! +KS3;CLAY, very silty;! +KS4;CLAY, extremely silty;! +KZ1;CLAY, slightly sandy;! +KZ2;CLAY, moderately sandy;! +KZ3;CLAY, very sandy;! +LZ1;SILT, slightly sandy;! +LZ3;SILT, very sandy;! +VM;PEAT;! +VZ1;PEAT, slightly sandy;! +VZ3;PEAT, very sandy;! +VK1;PEAT, slightly clayey;! +VK3;PEAT, very clayey;! +ZS1;SAND, slightly silty;! +ZS2;SAND, moderately silty;! +ZS3;SAND, very silty;! +ZS4;SAND, extremely silty;! +ZK;SAND, clayey;! +GM;no sample;! +NBE;no code;! +! +[Grondsoorten niet NEN 5104; dit lijstje mag eigenlijk niet worden gebruikt als volgens NEN 5104 wordt gewerkt!] +G;gravel;! +K;clay;! +L;silt;! +V;peat;! +Z;sand;! +GX;gravelly;! +G1;slightly gravelly;! +G2;moderately gravelly;! +G3;very gravelly;! +G4;extremely gravelly;! +KX;clayey;! +K1;slightly clayey;! +K2;moderately clayey;! +K3;very clayey;! +K4;extremely clayey;! +ZX;sandy;! +Z1;slightly sandy;! +Z2;moderately sandy;! +Z3;very sandy;! +Z4;extremely sandy;! +SX;silty;! +S1;slightly silty;! +S2;moderately silty;! +S3;very silty;! +S4;extremely silty;! +HX;peaty;! +H1;slightly peaty;! +H2;moderately peaty;! +H3;very peaty;! +H4;extremely peaty;! +GM;no sample;! +NBE;no code;! +! +[Grondsoorten en toevoegingen, niet genormeerd] +BLK;blokken;! +KEI;keien;! +STN;stenen;! +BRK;bruinkool;! +DET;detritus;! +DY;dy;! +GY;gyttja;! +HO;hout;! +GCZ;glauconietzand;! +GOZ;goethietzand;! +SHE;schelpen;! +SLI;slib;! +KAS;kalksteen;! +LEI;leisteen;! +MER;mergel;! +SHA;schalie;! +ZNS;zandsteen;! +GES;vast gesteente;! +AF;afval;! +AS;asfalt;! +BE;beton;! +BI;bitumen;! +BT;ballast;! +BST;baksteen;! +GI;gips;! +GA;glas;! +HK;houtskool;! +HU;huisvuil;! +KA;kalk;! +KG;kolengruis;! +KO;kolen;! +KT;krijt;! +ME;metaal;! +MI;mijnsteen;! +OE;oer;! +PL;planten;! +PU;puin;! +SI;sintels;! +SL;slakken;! +WO;wortels;! +YZ;ijzer;! +! +[Zandmediaan] +ZUF;uiterst fijn;! +ZZF;zeer fijn;! +ZMF;matig fijn;! +ZMG;matig grof;! +ZZG;zeer grof;! +ZUG;uiterst grof;! +! +[Grindmediaanklasse] +GFN;fijn grind;! +GMG;matig grof grind;! +GZG;zeer grof grind;! +! +[Hoofdkleur] +BL;blauw;! +BR;bruin;! +GE;geel;! +GN;groen;! +GR;grijs;! +OL;olijf;! +OR;oranje;! +PA;paars;! +RO;rood;! +WI;wit;! +RZ;roze;! +ZW;zwart;! +! +[Tweede kleur] +TBL;blauw-;! +TBR;bruin-;! +TGE;geel-;! +TGN;groen-;! +TGR;grijs-;! +TOL;olijf-;! +TOR;oranje-;! +TPA;paars-;! +TRO;rood-;! +TWI;wit-;! +TRZ;roze-;! +TZW;zwart-;! +! +[Kleurintensiteit] +LI;licht-;! +DO;donker-;! +! +[Zandspreiding] +SZK;zeer kleine spreiding;! +SMK;matig kleine spreiding;! +SMG;matig grote spreiding;! +SZG;zeer grote spreiding;! +STW;tweetoppige spreiding;! +! +[Korrelvorm] +ZZH;sterk hoekig;! +ZHK;hoekig;! +ZMH;matig hoekig;! +ZMA;matig afgerond;! +ZAF;afgerond;! +ZSA;sterk afgerond;! +! +[Grindfracties en hoeveelheden] +FN1;spoor fijn grind;! +FN2;weinig fijn grind;! +FN3;veel fijn grind;! +FN4;zeer veel fijn grind;! +FN5;uiterst veel fijn grind;! +MG1;spoor matig grof grind;! +MG2;weinig matig grof grind;! +MG3;veel matig grof grind;! +MG4;zeer veel matig grof grind;! +MG5;uiterst veel matig grof grind;! +GG1;spoor zeer grof grind;! +GG2;weinig zeer grof grind;! +GG3;veel zeer grof grind;! +GG4;zeer veel zeer grof grind;! +GG5;uiterst veel zeer grof grind;! +! +[Veen amorfiteit] +AV1;zwak amorf;! +AV2;matig amorf;! +AV3;sterk amorf;! +! +[Veensoorten] +BSV;bosveen;! +HEV;heideveen;! +MOV;mosveen;! +RIV;rietveen;! +SZV;Scheuchzeriaveen;! +VMV;veenmosveen;! +WOV;wollegrasveen;! +ZEV;zeggeveen;! +! +[Consistentie] +KZSL;zeer slap;! +LZSL;zeer slap;! +VZSL;zeer slap;! +KSLA;slap;! +LSLA;slap;! +VSLA;slap;! +KMSL;matig slap;! +LMSL;matig slap;! +VMSL;matig slap;! +KMST;matig stevig;! +LMST;matig stevig;! +VMST;matig stevig;! +KSTV;stevig;! +LSTV;stevig;! +VSTV;stevig;! +KZST;zeer stevig;! +LZST;zeer stevig;! +KHRD;hard;! +LHRD;hard;! +KZHR;zeer hard;! +LZHR;zeer hard;! +! +[Zandcompactie] +LOS;los gepakt;! +NOR;normaal gepakt;! +VAS;vast gepakt;! +! +[Vast gesteente hardheid] +VGZZ;zeer zacht;! +VGZA;zacht;! +VGMZ;matig zacht;! +VGMH;matig hard;! +VGHA;hard;! +VGZH;zeer hard;! +VGEH;extreem hard;! +! +[Hoeveelheid schelpmateriaal] +SCH0;geen schelpmateriaal;! +SCH1;spoor schelpmateriaal;! +SCH2;weinig schelpmateriaal;! +SCH3;veel schelpmateriaal;! +! +[Kalkgehalte] +CA1;not calcareous;! +CA2;calcareous;! +CA3;calcareous;! +! +[Hoeveelheid glauconiet] +GC0;geen glauconiet;! +GC1;spoor glauconiet;! +GC2;weinig glauconiet;! +GC3;veel glauconiet;! +GC4;zeer veel glauconiet;! +GC5;uiterst veel glauconiet;! +! +[Antropogene bijmengingen] +BST1;spoor baksteen;! +BST2;weinig baksteen;! +BST3;veel baksteen;! +PUR1;spoor puinresten;! +PUR2;weinig puinresten;! +PUR3;veel puinresten;! +SIN1;spoor sintels;! +SIN2;weinig sintels;! +SIN3;veel sintels;! +STO1;spoor stortsteen;! +STO2;weinig stortsteen;! +STO3;veel stortsteen;! +VUI1;spoor vuilnis;! +VUI2;weinig vuilnis;! +VUI3;veel vuilnis;! +AF;afval;! +AS;asfalt;! +BE;beton;! +BI;bitumen;! +BT;ballast;! +BST;baksteen;! +GI;gips;! +GA;glas;! +HK;houtskool;! +HU;huisvuil;! +KA;kalk;! +KG;kolengruis;! +KO;kolen;! +KT;krijt;! +ME;metaal;! +MI;mijnsteen;! +OE;oer;! +PL;planten;! +PU;puin;! +SI;sintels;! +SL;slakken;! +WO;wortels;! +YZ;ijzer;! +GL;gley;! +RT;roest;! +SE;silex;! +! +[Gelaagdheid] +BIO;bioturbatie;! +DWO;doorworteling;! +GCM;cm-gelaagdheid;! +GDM;dm-gelaagdheid;! +GDU;dubbeltjes-gelaagdheid;! +GMM;mm-gelaagdheid;! +GRG;graafgangen;! +GSC;scheve gelaagdheid;! +GSP;spekkoek-gelaagdheid;! +HOM;homogeen;! +GE1;zwak gelaagd;! +GE2;weinig gelaagd;! +GE3;sterk gelaagd;! +GEX;gelaagd;! +STGL;met grindlagen;! +STKL;met kleilagen;! +STLL;met leemlagen;! +STSL;met stenenlagen;! +STVL;met veenlagen;! +STZL;met zandlagen;! +STBR;met bruinkoollagen;! +STDE;met detrituslagen;! +STGY;met gyttjalagen;! +STSC;met schelpenlagen;! +! +[Geologische interpretatie] +ANT;Antropogeen;! +BOO;Boomse klei;! +DEZ;dekzand;! +KEL;keileem;! +LSS;loess;! +POK;potklei;! +WAR;warven;! +! +[Stratigrafische interpretatie] +DR;Formatie van Drente;! +EC;Formatie van Echteld;! +KR;Formatie van Kreftenheye;! +NA;Formatie van Naaldwijk;! +NI;Formatie van Nieuwkoop;! +TW;Formatie van Twente;! +WA;Formatie van Waalre;! +! Index: DamClients/DamLive/trunk/lib/DSL-Geographic/ReleaseNotes.txt =================================================================== diff -u --- DamClients/DamLive/trunk/lib/DSL-Geographic/ReleaseNotes.txt (revision 0) +++ DamClients/DamLive/trunk/lib/DSL-Geographic/ReleaseNotes.txt (revision 3224) @@ -0,0 +1,39 @@ +r2112 +Release for new DSL Core +------------------------------ +r1439 +Release 16.1.4.xxx +--------------------- +r1438 +Release binaries DSLGeographic Related to Issue [MDNLIB-834] +--------------------- +r1436 +Set version to 16.1.4.xxx +--------------------- +r1435 +Set DSLCore lib to 16.1.4 tag +--------------------- +r1416 +Page with signatures added Related to Issue [MDNLIB-817] +--------------------- +r1414 +DslGeographic internal release +--------------------- +r1408 +Reference number removed Related to Issue [MDNLIB-822] +--------------------- +r1398 +Release for this issue 1394.84 +--------------------- +r1385 +Release for this Issue. Related to Issue [MDNLIB-833] +--------------------- +r1382 +Preparing for 16.1.4 release of DSL Related to Issue [MDNLIB-834] +--------------------- +r1348 +Added a recommendation for improving the coverage +--------------------- +r1344 +Update test report with the latest code coverage. Related to Issue [MDNLIB-822] +--------------------- Index: DamClients/DamLive/trunk/lib/DSL-Geographic/Deltares.Geographic.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Gef2.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Core/ReleaseNotes.txt =================================================================== diff -u --- DamClients/DamLive/trunk/lib/DSL-Core/ReleaseNotes.txt (revision 0) +++ DamClients/DamLive/trunk/lib/DSL-Core/ReleaseNotes.txt (revision 3224) @@ -0,0 +1,60 @@ +r2174 +Added Set mthod for IValidationResult +--------------------- +r1432 +Release 16.1.4.xxx +--------------------- +r1431 +Release binaries DSLCore Related to Issue [MDNLIB-834] +--------------------- +r1429 +Set version to 16.1.4.xxx Related to Issue [MDNLIB-834] +--------------------- +r1417 +PDF version 16.1.3 of Test Report added including signatures +--------------------- +r1416 +Page with signatures added Related to Issue [MDNLIB-817] +--------------------- +r1412 +DslCore internal release Related to Issue [WIUI-142] +--------------------- +r1411 +Added LargeLength unit with [km] as base unit, required for BM Asphalt WaveImpact Also added some missing tests i found for SmallLengt unit Related to Issue [WIUI-142] +--------------------- +r1403 +Reference number removed Related to Issue [MDNLIB-817] +--------------------- +r1394 +Release for this issue 1391.175 Related to Issue [DSB-796] +--------------------- +r1391 +Ensure that when called with property = null, propertyInfo returns null. Related to Issue [MDNLIB-833] +--------------------- +r1383 +Release for this Issue. +--------------------- +r1380 +Set the enabled field too when checking IsEnable. This helps in determination of proper status. Related to Issue [MDNLIB-833] +--------------------- +r1377 +Added missing ReadOnly attribute for Subject. Related to Issue [MACUI-202] +--------------------- +r1355 +Small corrections wrt the coverage data. Related to Issue [MNDLIB-817] +--------------------- +r1337 +Updated the test report. Related to Issue [MDNLIB-817] +--------------------- +r1265 +Added unit tests for PercentageUnit Related to Issue [DSB-624] Merged revision(s) 1247 from DSL/DslCore/trunk: +--------------------- +r1247 +Added unit tests for PercentageUnit Related to Issue [DSB-624] +--------------------- +r1220 +DslCore internal release Related to Issue [DSB-668] +--------------------- +r1219 +Removed dead code & related translation, MinimumAttribute should not do the job of NotClearAttribute ;-) Related to Issue [DSB-668] +--------------------- Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/GefBoreNL.dat =================================================================== diff -u --- DamClients/DamLive/trunk/lib/DSL-GeoIO/GefBoreNL.dat (revision 0) +++ DamClients/DamLive/trunk/lib/DSL-GeoIO/GefBoreNL.dat (revision 3224) @@ -0,0 +1,355 @@ +! Datafile for Gef2.dll. +! =========================================================================== +! COMPANY : GeoDelft +! LICENSE : CUR and Delft Cluster +! DATE : 2002-02-28 +! TIME : 12:00:00 +! FILENAME : GefBoreNL.dat +! CREATED BY : GeoDelft and TNO-NITG version 2.0 +! ======================== BEGINNING OF DATA ========================== +[Grondsoort NEN 5104] +G1;zwak grindig;! +G2;matig grindig;! +G3;sterk grindig;! +H1;zwak humeus;! +H2;matig humeus;! +H3;sterk humeus;! +GS;grind, siltig;! +GZ1;grind, zwak zandig;! +GZ2;grind, matig zandig;! +GZ3;grind, sterk zandig;! +GZ4;grind, uiterst zandig;! +KS1;klei, zwak siltig;! +KS2;klei, matig siltig;! +KS3;klei, sterk siltig;! +KS4;klei, uiterst siltig;! +KZ1;klei, zwak zandig;! +KZ2;klei, matig zandig;! +KZ3;klei, sterk zandig;! +LZ1;leem, zwak zandig;! +LZ3;leem, sterk zandig;! +VM;veen, mineraalarm;! +VZ1;veen, zwak zandig;! +VZ3;veen, sterk zandig;! +VK1;veen, zwak kleiig;! +VK3;veen, sterk kleiig;! +ZS1;zand, zwak siltig;! +ZS2;zand, matig siltig;! +ZS3;zand, sterk siltig;! +ZS4;zand, uiterst siltig;! +ZK;zand, kleiig;! +GM;geen monster;! +NBE;niet benoemd;! +! +[Grondsoorten niet NEN 5104; dit lijstje mag eigenlijk niet worden gebruikt als volgens NEN 5104 wordt gewerkt!] +G;grind;! +K;klei;! +L;leem;! +V;veen;! +Z;zand;! +GX;grindig;! +G1;zwak grindig;! +G2;matig grindig;! +G3;sterk grindig;! +G4;uiterst grindig;! +KX;kleiig;! +K1;zwak kleiig;! +K2;matig kleiig;! +K3;sterk kleiig;! +K4;uiterst kleiig;! +ZX;zandig;! +Z1;zwak zandig;! +Z2;matig zandig;! +Z3;sterk zandig;! +Z4;uiterst zandig;! +SX;siltig;! +S1;zwak siltig;! +S2;matig siltig;! +S3;sterk siltig;! +S4;uiterst siltig;! +HX;humeus;! +H1;zwak humeus;! +H2;matig humeus;! +H3;sterk humeus;! +H4;uiterst humeus;! +GM;geen monster;! +NBE;niet benoemd;! +! +[Grondsoorten en toevoegingen, niet genormeerd] +BLK;blokken;! +KEI;keien;! +STN;stenen;! +BRK;bruinkool;! +DET;detritus;! +DY;dy;! +GY;gyttja;! +HO;hout;! +GCZ;glauconietzand;! +GOZ;goethietzand;! +SHE;schelpen;! +SLI;slib;! +KAS;kalksteen;! +LEI;leisteen;! +MER;mergel;! +SHA;schalie;! +ZNS;zandsteen;! +GES;vast gesteente;! +AF;afval;! +AS;asfalt;! +BE;beton;! +BI;bitumen;! +BT;ballast;! +BST;baksteen;! +GI;gips;! +GA;glas;! +HK;houtskool;! +HU;huisvuil;! +KA;kalk;! +KG;kolengruis;! +KO;kolen;! +KT;krijt;! +ME;metaal;! +MI;mijnsteen;! +OE;oer;! +PL;planten;! +PU;puin;! +SI;sintels;! +SL;slakken;! +WO;wortels;! +YZ;ijzer;! +! +[Zandmediaan] +ZUF;uiterst fijn;! +ZZF;zeer fijn;! +ZMF;matig fijn;! +ZMG;matig grof;! +ZZG;zeer grof;! +ZUG;uiterst grof;! +! +[Grindmediaanklasse] +GFN;fijn grind;! +GMG;matig grof grind;! +GZG;zeer grof grind;! +! +[Hoofdkleur] +BL;blauw;! +BR;bruin;! +GE;geel;! +GN;groen;! +GR;grijs;! +OL;olijf;! +OR;oranje;! +PA;paars;! +RO;rood;! +WI;wit;! +RZ;roze;! +ZW;zwart;! +! +[Tweede kleur] +TBL;blauw-;! +TBR;bruin-;! +TGE;geel-;! +TGN;groen-;! +TGR;grijs-;! +TOL;olijf-;! +TOR;oranje-;! +TPA;paars-;! +TRO;rood-;! +TWI;wit-;! +TRZ;roze-;! +TZW;zwart-;! +! +[Kleurintensiteit] +LI;licht-;! +DO;donker-;! +! +[Zandspreiding] +SZK;zeer kleine spreiding;! +SMK;matig kleine spreiding;! +SMG;matig grote spreiding;! +SZG;zeer grote spreiding;! +STW;tweetoppige spreiding;! +! +[Korrelvorm] +ZZH;sterk hoekig;! +ZHK;hoekig;! +ZMH;matig hoekig;! +ZMA;matig afgerond;! +ZAF;afgerond;! +ZSA;sterk afgerond;! +! +[Grindfracties en hoeveelheden] +FN1;spoor fijn grind;! +FN2;weinig fijn grind;! +FN3;veel fijn grind;! +FN4;zeer veel fijn grind;! +FN5;uiterst veel fijn grind;! +MG1;spoor matig grof grind;! +MG2;weinig matig grof grind;! +MG3;veel matig grof grind;! +MG4;zeer veel matig grof grind;! +MG5;uiterst veel matig grof grind;! +GG1;spoor zeer grof grind;! +GG2;weinig zeer grof grind;! +GG3;veel zeer grof grind;! +GG4;zeer veel zeer grof grind;! +GG5;uiterst veel zeer grof grind;! +! +[Veen amorfiteit] +AV1;zwak amorf;! +AV2;matig amorf;! +AV3;sterk amorf;! +! +[Veensoorten] +BSV;bosveen;! +HEV;heideveen;! +MOV;mosveen;! +RIV;rietveen;! +SZV;Scheuchzeriaveen;! +VMV;veenmosveen;! +WOV;wollegrasveen;! +ZEV;zeggeveen;! +! +[Consistentie] +KZSL;zeer slap;! +LZSL;zeer slap;! +VZSL;zeer slap;! +KSLA;slap;! +LSLA;slap;! +VSLA;slap;! +KMSL;matig slap;! +LMSL;matig slap;! +VMSL;matig slap;! +KMST;matig stevig;! +LMST;matig stevig;! +VMST;matig stevig;! +KSTV;stevig;! +LSTV;stevig;! +VSTV;stevig;! +KZST;zeer stevig;! +LZST;zeer stevig;! +KHRD;hard;! +LHRD;hard;! +KZHR;zeer hard;! +LZHR;zeer hard;! +! +[Zandcompactie] +LOS;los gepakt;! +NOR;normaal gepakt;! +VAS;vast gepakt;! +! +[Vast gesteente hardheid] +VGZZ;zeer zacht;! +VGZA;zacht;! +VGMZ;matig zacht;! +VGMH;matig hard;! +VGHA;hard;! +VGZH;zeer hard;! +VGEH;extreem hard;! +! +[Hoeveelheid schelpmateriaal] +SCH0;geen schelpmateriaal;! +SCH1;spoor schelpmateriaal;! +SCH2;weinig schelpmateriaal;! +SCH3;veel schelpmateriaal;! +! +[Kalkgehalte] +CA1;kalkloos;! +CA2;kalkarm;! +CA3;kalkrijk;! +! +[Hoeveelheid glauconiet] +GC0;geen glauconiet;! +GC1;spoor glauconiet;! +GC2;weinig glauconiet;! +GC3;veel glauconiet;! +GC4;zeer veel glauconiet;! +GC5;uiterst veel glauconiet;! +! +[Antropogene bijmengingen] +BST1;spoor baksteen;! +BST2;weinig baksteen;! +BST3;veel baksteen;! +PUR1;spoor puinresten;! +PUR2;weinig puinresten;! +PUR3;veel puinresten;! +SIN1;spoor sintels;! +SIN2;weinig sintels;! +SIN3;veel sintels;! +STO1;spoor stortsteen;! +STO2;weinig stortsteen;! +STO3;veel stortsteen;! +VUI1;spoor vuilnis;! +VUI2;weinig vuilnis;! +VUI3;veel vuilnis;! +AF;afval;! +AS;asfalt;! +BE;beton;! +BI;bitumen;! +BT;ballast;! +BST;baksteen;! +GI;gips;! +GA;glas;! +HK;houtskool;! +HU;huisvuil;! +KA;kalk;! +KG;kolengruis;! +KO;kolen;! +KT;krijt;! +ME;metaal;! +MI;mijnsteen;! +OE;oer;! +PL;planten;! +PU;puin;! +SI;sintels;! +SL;slakken;! +WO;wortels;! +YZ;ijzer;! +GL;gley;! +RT;roest;! +SE;silex;! +! +[Gelaagdheid] +BIO;bioturbatie;! +DWO;doorworteling;! +GCM;cm-gelaagdheid;! +GDM;dm-gelaagdheid;! +GDU;dubbeltjes-gelaagdheid;! +GMM;mm-gelaagdheid;! +GRG;graafgangen;! +GSC;scheve gelaagdheid;! +GSP;spekkoek-gelaagdheid;! +HOM;homogeen;! +GE1;zwak gelaagd;! +GE2;weinig gelaagd;! +GE3;sterk gelaagd;! +GEX;gelaagd;! +STGL;met grindlagen;! +STKL;met kleilagen;! +STLL;met leemlagen;! +STSL;met stenenlagen;! +STVL;met veenlagen;! +STZL;met zandlagen;! +STBR;met bruinkoollagen;! +STDE;met detrituslagen;! +STGY;met gyttjalagen;! +STSC;met schelpenlagen;! +! +[Geologische interpretatie] +ANT;Antropogeen;! +BOO;Boomse klei;! +DEZ;dekzand;! +KEL;keileem;! +LSS;loess;! +POK;potklei;! +WAR;warven;! +! +[Stratigrafische interpretatie] +DR;Formatie van Drente;! +EC;Formatie van Echteld;! +KR;Formatie van Kreftenheye;! +NA;Formatie van Naaldwijk;! +NI;Formatie van Nieuwkoop;! +TW;Formatie van Twente;! +WA;Formatie van Waalre;! +! Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Geometry.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Soilbase.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Geotechnics.TestUtils.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Probabilistic.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/ReleaseNotes.txt =================================================================== diff -u --- DamClients/DamLive/trunk/lib/DSL-GeoIO/ReleaseNotes.txt (revision 0) +++ DamClients/DamLive/trunk/lib/DSL-GeoIO/ReleaseNotes.txt (revision 3224) @@ -0,0 +1,99 @@ +r2181 +Release for DSL Core an DSL Geo +----------------------------------------------- +r1448 +Release 16.1.4.xxx +--------------------- +r1447 +Release binaries DSLGeoIo Related to Issue [MDNLIB-834] +--------------------- +r1446 +Set DSLCore, DSLProbabilistic, DSLGeographic and DSLGeo lib to 16.1.4 tag Related to Issue [MDNLIB-834] +--------------------- +r1445 +Set version to 16.1.4.xxx +--------------------- +r1425 +DslGeoIo internal release +--------------------- +r1416 +Page with signatures added Related to Issue [MDNLIB-817] +--------------------- +r1409 +Reference number removed +--------------------- +r1397 +Release for this issue 1396.342 +--------------------- +r1387 +Release for this Issue. +--------------------- +r1382 +Preparing for 16.1.4 release of DSL Related to Issue [MDNLIB-834] +--------------------- +r1367 +Release binaries +--------------------- +r1347 +Update of the test report - new screenshots and new code coverage results. Related to Issue [MDNLIB-823] +--------------------- +r1346 +DslGeoIo internal release +--------------------- +r1345 +Fixed bug caused by earlier commite, by setting Stochastic properties of Soil class directly without touching the associated property the soil class doesn't record the fact that the property has changed and as a result the values set may ge... +--------------------- +r1334 +remove category work in progress, as issue is fixed Related to Issue [DSB-710] +--------------------- +r1320 +Release binaries Related to Issue [DSB-494] +--------------------- +r1313 +Fixed failing test +--------------------- +r1312 +Fixed failing test +--------------------- +r1311 +Fixed failing test Related to Issue [DSB-727] +--------------------- +r1300 +Added method to ensure proper split of all curves after reading them from the file. Related to Issue [DSB-710] +--------------------- +r1299 +Fixed reading ShearStrengthType Related to Issue [DSB-727] +--------------------- +r1293 +Fix failing tests +--------------------- +r1290 +Fix failing tests Related to Issue [DSB-708] +--------------------- +r1286 +Release binaries Related to Issue [DSB-604] Related to Issue [DSB-710] Related to Issue [DSB-666] Related to Issue [DSB-619] Related to Issue [DSB-679] Related to Issue [DSB-624] +--------------------- +r1263 +Fixed test which was failing because the void values in Borings is now imported as NaN Related to Issue [DSB-604] +--------------------- +r1260 +Improved the GefBoringFileImporter to assign double.NaN to voids in the data rows, includes unit test Related to Issue [DSB-604] +--------------------- +r1258 +Removed redundant file Related to Issue [DSB-710] +--------------------- +r1256 +Added failing (WorkInProgress) test to illustrate issue Related to Issue [DSB-710] +--------------------- +r1255 +SpecificMechanismPointLocation supports FlowSide now (although it's registered outside and stored in MechanismSupport singleton). SpecificMechanismPointLocation should ignore None(All) and Stability mechanisms, but Piping should be set by d... +--------------------- +r1250 +Spotted one unit test not being run, [Test] attribute was missing Related to Issue [DSB-619] +--------------------- +r1249 +Improved unit test by using different input (GEF 1.1 having separate void values per column) so we can see the void values being swapped Related to Issue [DSB-679] +--------------------- +r1248 +Adjusted unit test to eliminate guess work as to how the row.Level field is calculated as suggested by reviewer Related to Issue [DSB-624] +--------------------- Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/icudt30.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/Deltares.Probabilistic.Version.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geographic/Deltares.Standard.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/Deltares.Mathematics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Core/Deltares.Standard.Version.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/Deltares.Probabilistic.TestUtils.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/icuin30.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/DGSGEF.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Geometry.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geographic/MathNet.Numerics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Geometry.TestUtils.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/Deltares.Geotechnics.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Geo/ReleaseNotes.txt =================================================================== diff -u --- DamClients/DamLive/trunk/lib/DSL-Geo/ReleaseNotes.txt (revision 0) +++ DamClients/DamLive/trunk/lib/DSL-Geo/ReleaseNotes.txt (revision 3224) @@ -0,0 +1,122 @@ +r2179 +Release for DSL Core and adapted surfaceline2 (new validations inclusing tests). +r1444 +Release 16.1.4.xxx +--------------------- +r1443 +Release binaries DSLGeo +--------------------- +r1442 +Set DSLCore, DSLProbabilistic and DSLGeographic lib to 16.1.4 tag +--------------------- +r1441 +Set version to 16.1.4.xxx +--------------------- +r1416 +Page with signatures added Related to Issue [MDNLIB-817] +--------------------- +r1415 +DslGeo internal release +--------------------- +r1407 +Reference number removed +--------------------- +r1396 +Release for this issue 1395.442 Related to Issue [DSB-796] +--------------------- +r1386 +Release for this Issue. +--------------------- +r1382 +Preparing for 16.1.4 release of DSL Related to Issue [MDNLIB-834] +--------------------- +r1379 +Changed unit for Z from Length to Depth as requested by this issue. Related to Issue [MACUI-203] +--------------------- +r1375 +Added translations for phreatic line here too. Related to Issue [MACUI-189] +--------------------- +r1373 +Added copying the StressStochast for the PreconsolidationStressses as these were not yet copied, contributing to the errors found in this issue. Related to Issue [MACUI-187] +--------------------- +r1357 +Release binaries Related to Issue [MACUI-178] +--------------------- +r1350 +Correct some coverage data and make sure each screenshot is placed correctly Related to Issue [MDNLIB-818] +--------------------- +r1349 +The problem was caused by out of date surfaces before regeneration. However, these surfaces are not needed at all at this stage so clearing the surfaces is the answer. Related to Issue [MACUI-178] +--------------------- +r1343 +Updated the PDF file Related to Issue [MDNLIB-818] +--------------------- +r1342 +Updated the test report with the latest code coverage information Related to Issue [MDNLIB-818] +--------------------- +r1336 +DslGeo internal release Related to Issue [DSB-601] +--------------------- +r1335 +ConpenetrationTestData: GroundLevel translated to "Z" as requested by Virginie Related to Issue [DSB-601] +--------------------- +r1331 +DslGeo internal release Related to Issue [DSB-604] +--------------------- +r1323 +Added translations for Boring methods (table from GEF document is insufficient so this is based on BoringDefinition.xsd Related to Issue [DSB-604] +--------------------- +r1309 +Release binaries Related to Issue [DSB-710] +--------------------- +r1301 +internal release Related to Issue [DSB-687] +--------------------- +r1300 +Added method to ensure proper split of all curves after reading them from the file. Related to Issue [DSB-710] +--------------------- +r1298 +added validation to SoilLayer - it should have a Soil assigned Related to Issue [DSB-687] +--------------------- +r1297 +Translation for Maaiveld property of Boring changed to "Z" Related to Issue [DSB-604] +--------------------- +r1296 +Prevent "empty" curves when splitting. Related to Issue [DSB-710] +--------------------- +r1294 +DSLGeo internal release Related to Issue [DSB-604] +--------------------- +r1292 +Fixed translations for Boring layers (gamma sat/unsat, material code/name) Related to Issue [DSB-604] +--------------------- +r1262 +Internal release for this issue 1261.416 +--------------------- +r1261 +Make sure that when you clone a profile1D, you clone the layers with the type they actually are instead of hard creating SoilLayer1D layers. This enables the cloning of SoilProfiles1D with SosSoilLayers. This in turn solves the problem ment... +--------------------- +r1259 +Remove obsolete comment Related to Issue [DSB-708] +--------------------- +r1257 +Fixed Issue which prevented test SoilProfile2DFromDSerieFileImporterTests.IssueDSB_710() in DslGeoIO from running correctly Related to Issue [DSB-710] +--------------------- +r1254 +Internal release for this issue 1253.412 Related to Issue [DSB-708] +--------------------- +r1253 +Solved the bug, not the underlying strange behavior (707). +--------------------- +r1252 +Solved the bug, not the underlying strange behavior (707). Related to Issue [DSB-708] +--------------------- +r1251 +added missing translation Related to Issue [DSB-666] +--------------------- +r1246 +internal release Related to Issue [DSB-673] +--------------------- +r1242 +Mechanism.None now has it's own alias for the translation. Related to Issue [DSB-673] +--------------------- Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/fbembed.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-Probabilistic/Deltares.Probabilistic.dll =================================================================== diff -u Binary files differ Index: DamClients/DamLive/trunk/lib/DSL-GeoIO/Deltares.Geotechnics.IO.dll =================================================================== diff -u Binary files differ