Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf =================================================================== diff -u -r25bdf707d3cd78e182705e16371a376222b7ee79 -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf (.../Licentie.rtf) (revision 25bdf707d3cd78e182705e16371a376222b7ee79) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf (.../Licentie.rtf) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -1,32 +1,32 @@ -{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang2057\deflangfe2052\themelang2057\themelangfe2052\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} -{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ??????????????????????\'a1\'a7????????};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} -{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f43\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}@SimSun;} -{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ??????????????????????\'a1\'a7????????};} +{\rtf1\adeflang2128\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1043\deflangfe2052\themelang2057\themelangfe2052\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} +{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ???????????????????????\'a1\'ec???????};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} +{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f44\fbidi \fnil\fcharset134\fprq2{\*\panose 00000000000000000000}@SimSun;} +{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ???????????????????????\'a1\'ec???????};} {\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ??????????????????????\'a1\'a7????????};} -{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f44\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\f45\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f47\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f48\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f49\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\f50\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f51\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f52\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f64\fbidi \fmodern\fcharset238\fprq1 Courier New CE;} -{\f65\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f67\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f68\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f69\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);} -{\f70\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f71\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f72\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);} -{\f176\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ??????????????????????\'a1\'a7????????};}{\f384\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f385\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} -{\f387\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f388\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f391\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f392\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} -{\f414\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f415\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f417\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f418\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} -{\f421\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f422\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f424\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f425\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;} -{\f427\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}{\f428\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f429\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f430\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);} -{\f431\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f432\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f433\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f476\fbidi \fnil\fcharset0\fprq2 @SimSun Western;} +{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ???????????????????????\'a1\'ec???????};} +{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f45\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\f46\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f48\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f49\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f50\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\f51\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f52\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f53\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f65\fbidi \fmodern\fcharset238\fprq1 Courier New CE;} +{\f66\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f68\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f69\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f70\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);} +{\f71\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f72\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f73\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);} +{\f177\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ???????????????????????\'a1\'ec???????};}{\f385\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f386\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} +{\f388\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f389\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f392\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f393\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} +{\f425\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f426\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f428\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f429\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\f432\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f433\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f435\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f436\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;} +{\f438\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}{\f439\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f440\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f441\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);} +{\f442\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f443\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f444\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f487\fbidi \fnil\fcharset0\fprq2 @SimSun Western;} {\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} {\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} {\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ??????????????????????\'a1\'a7????????};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;} +{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ???????????????????????\'a1\'ec???????};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;} {\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;} {\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} {\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} {\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} {\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} {\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbminor\f31560\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ??????????????????????\'a1\'a7????????};}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} +{\fdbminor\f31560\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ???????????????????????\'a1\'ec???????};}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} {\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} {\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} @@ -36,21 +36,21 @@ {\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1 -\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \snext11 \ssemihidden \sunhideused +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang2128 \ltrch\fcs0 \fs22\lang1043\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1043\langfenp2052 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf17 \sbasedon10 \sunhideused \styrsid7675473 Hyperlink;}{\*\cs16 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 \sbasedon10 \ssemihidden \sunhideused \styrsid7675473 annotation reference;}{\s17\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 \fs20\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext17 \slink18 \ssemihidden \sunhideused \styrsid7675473 annotation text;}{\*\cs18 \additive \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20 -\sbasedon10 \slink17 \slocked \ssemihidden \styrsid7675473 Comment Text Char;}{\s19\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs16\alang1025 \ltrch\fcs0 -\fs16\lang2057\langfe2052\loch\f38\hich\af38\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext19 \slink20 \ssemihidden \sunhideused \styrsid7675473 Balloon Text;}{\*\cs20 \additive \rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16 +\sbasedon10 \slink17 \slocked \ssemihidden \styrsid7675473 Comment Text Char;}{\s19\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs16\alang1025 \ltrch\fcs0 +\fs16\lang2057\langfe2052\loch\f39\hich\af39\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext19 \slink20 \ssemihidden \sunhideused \styrsid7675473 Balloon Text;}{\*\cs20 \additive \rtlch\fcs1 \af39\afs16 \ltrch\fcs0 \f39\fs16 \sbasedon10 \slink19 \slocked \ssemihidden \styrsid7675473 Balloon Text Char;}{\s21\ql \li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\contextualspace \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext21 \sqformat \spriority34 \styrsid1010843 List Paragraph;}}{\*\rsidtbl \rsid23861\rsid488029\rsid799973\rsid984897\rsid1010843\rsid1055020 -\rsid1180769\rsid1201894\rsid1206572\rsid1391986\rsid1800570\rsid1862769\rsid1918796\rsid2112962\rsid2185294\rsid2448324\rsid2703580\rsid3020322\rsid3093214\rsid3241544\rsid3426710\rsid3474088\rsid3612330\rsid3686156\rsid4150084\rsid4392039\rsid4733976 -\rsid4742281\rsid5267739\rsid5593428\rsid5862844\rsid5910193\rsid6122838\rsid6624093\rsid6822061\rsid6904447\rsid6947589\rsid7414554\rsid7672292\rsid7675473\rsid7691196\rsid7822308\rsid7881760\rsid8282417\rsid8336808\rsid8355315\rsid8415516\rsid8471656 -\rsid8613675\rsid9251590\rsid9259169\rsid9259511\rsid9324301\rsid9447286\rsid9534683\rsid9597286\rsid9837452\rsid10243997\rsid10645519\rsid10889275\rsid10903480\rsid10907227\rsid10965045\rsid10969153\rsid11404854\rsid11541481\rsid11865015\rsid11875882 -\rsid12255994\rsid12603449\rsid12614763\rsid12714335\rsid12780684\rsid12874015\rsid12992049\rsid13187850\rsid13327662\rsid13378822\rsid13707436\rsid13846203\rsid13923732\rsid14042855\rsid14624369\rsid14690030\rsid14697806\rsid14769386\rsid15292511 -\rsid15341850\rsid15549573\rsid15600639\rsid15998385\rsid16073068\rsid16086011\rsid16653078}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title License Agreement} -{\author Deltares}{\operator Robert Tangerman}{\creatim\yr2016\mo1\dy13\hr16\min25}{\revtim\yr2016\mo3\dy3\hr9\min11}{\printim\yr2016\mo1\dy13\hr13\min29}{\version30}{\edmins31}{\nofpages3}{\nofwords862}{\nofchars4915}{\*\company Stichting Deltares} -{\nofcharsws5766}{\vern49167}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +\rsid1180769\rsid1201894\rsid1206572\rsid1391986\rsid1800570\rsid1862769\rsid1918796\rsid2112962\rsid2185294\rsid2448324\rsid2703580\rsid3020322\rsid3093214\rsid3172558\rsid3241544\rsid3426710\rsid3474088\rsid3612330\rsid3686156\rsid4150084\rsid4392039 +\rsid4733976\rsid4742281\rsid5267739\rsid5593428\rsid5862844\rsid5910193\rsid6122838\rsid6624093\rsid6822061\rsid6904447\rsid6947589\rsid7414554\rsid7672292\rsid7675473\rsid7691196\rsid7822308\rsid7881760\rsid8282417\rsid8336808\rsid8355315\rsid8415516 +\rsid8471656\rsid8613675\rsid9251590\rsid9259169\rsid9259511\rsid9324301\rsid9447286\rsid9534683\rsid9597286\rsid9837452\rsid10243997\rsid10641850\rsid10645519\rsid10889275\rsid10903480\rsid10907227\rsid10965045\rsid10969153\rsid11404854\rsid11541481 +\rsid11865015\rsid11875882\rsid12255994\rsid12603449\rsid12614763\rsid12714335\rsid12780684\rsid12874015\rsid12992049\rsid13187850\rsid13327662\rsid13378822\rsid13707436\rsid13846203\rsid13923732\rsid14042855\rsid14624369\rsid14690030\rsid14697806 +\rsid14769386\rsid15038976\rsid15292511\rsid15341850\rsid15549573\rsid15600639\rsid15998385\rsid16073068\rsid16086011\rsid16653078}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0 +\mnaryLim1}{\info{\title License Agreement}{\author Deltares}{\operator Jo\'ebl van den Berg}{\creatim\yr2016\mo1\dy13\hr16\min25}{\revtim\yr2016\mo3\dy18\hr14\min11}{\printim\yr2016\mo1\dy13\hr13\min29}{\version33}{\edmins33}{\nofpages3}{\nofwords896} +{\nofchars4934}{\*\company Stichting Deltares}{\nofcharsws5819}{\vern49167}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect \widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1 \noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1 \jexpand\viewkind1\viewscale110\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct @@ -156,7 +156,7 @@ \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9324301\charrsid9597286 \hich\af2\dbch\af31505\loch\f2 6}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015\charrsid9597286 \hich\af2\dbch\af31505\loch\f2 . Core.Common.Version.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015 \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid7414554 \hich\af2\dbch\af31505\loch\f2 7. Core.Components.Gis.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid6122838 \hich\af2\dbch\af31505\loch\f2 8\hich\af2\dbch\af31505\loch\f2 . Core.Components.Gis.Forms.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid6122838 \hich\af2\dbch\af31505\loch\f2 8. Core.Components.Gis.Forms.dll \par \hich\af2\dbch\af31505\loch\f2 9}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281 \hich\af2\dbch\af31505\loch\f2 . Core.Components.G}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid8355315 \hich\af2\dbch\af31505\loch\f2 is}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281 \hich\af2\dbch\af31505\loch\f2 .IO.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281\charrsid9597286 @@ -177,7 +177,7 @@ \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid6122838 \hich\af2\dbch\af31505\loch\f2 17}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015\charrsid9597286 \hich\af2\dbch\af31505\loch\f2 . Core.Plugins.DotSpatial.dll \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid6122838 \hich\af2\dbch\af31505\loch\f2 18}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015\charrsid9597286 -\hich\af2\dbch\af31505\loch\f2 . Core.Plugi\hich\af2\dbch\af31505\loch\f2 ns.OxyPlot.dll +\hich\af2\dbch\af31505\loch\f2 . Core.Plugins.OxyPlot.dll \par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid1391986 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid6122838 \hich\af2\dbch\af31505\loch\f2 19}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015 \hich\af2\dbch\af31505\loch\f2 . }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015\charrsid10243997 \hich\af2\dbch\af31505\loch\f2 Core.Plugins.ProjectExplorer.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015\charrsid13187850 @@ -213,33 +213,44 @@ \f2\fs21\insrsid3241544 0}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Data.dll \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 11}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 .Forms.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 12}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Plugin.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 13}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Calculation.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 14}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Data.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 15}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Forms.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 16}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.IO.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 17}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Plugin.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 18}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Service.dll +\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid10641850 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 12}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Plugin.dll +\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid3241544 \hich\af2\dbch\af31505\loch\f2 1}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 3}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Data.dll +\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid10641850 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 14}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Forms.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 +\par \hich\af2\dbch\af31505\loch\f2 15. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850\charrsid10641850 \hich\af2\dbch\af31505\loch\f2 Ringtoets.Piping.InputParameterCalculation}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15038976 +\hich\af2\dbch\af31505\loch\f2 .dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850\charrsid15600639 +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 16}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.IO.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\insrsid10641850\charrsid15600639 +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 1}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 7}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\insrsid10641850\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 KernelWrapper}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 .dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 +\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 18}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Plugin.dll +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid10641850 \hich\af2\dbch\af31505\loch\f2 19}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Service.dll \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 -\par }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\insrsid15600639\charrsid3241544 \hich\af2\dbch\af31505\loch\f2 A. \tab }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 -\hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU LESSER GENERAL PUBLIC LICENSE\'94\loch\f2 versie 3 zoals gepubliceerd door de Free Software Foundation. +\par }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid3172558 \hich\af2\dbch\af31505\loch\f2 A. \tab }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 +\b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU LESSER GENERAL PUBLIC LICENSE\'94\loch\f2 versie 3 zoals gepublicee +\hich\af2\dbch\af31505\loch\f2 rd door de Free Software Foundation. \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid9259511 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 1. }{\rtlch\fcs1 -\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \loch\f2 is software vo\hich\af2\dbch\af31505\loch\f2 -or het gebruik bij het toetsen van dijken overeenkomstig het }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511 \hich\af2\dbch\af31505\loch\f2 WTI 2017 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar functionali -\hich\af2\dbch\af31505\loch\f2 teiten. Ieder ander gebruik wordt ten stelligste afgeraden door Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511 +\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \loch\f2 + is software voor het gebruik bij het toetsen van dijken overeenkomstig het }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511 \hich\af2\dbch\af31505\loch\f2 WTI 2017 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 +voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar functionaliteiten. Ieder ander gebruik wordt ten stelligste afgeraden door Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \par \hich\af2\dbch\af31505\loch\f2 2. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Copyright }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15341850 \loch\af2\dbch\af31505\hich\f2 \'a9\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Stichting Deltares, 201}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 6}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 .}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Alle rechten voorbehouden. +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 A\hich\af2\dbch\af31505\loch\f2 lle rechten voorbehouden. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 3}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . U mag het programma }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 zelf verder verspreiden}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 en/of aanpassen }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid1010843 \hich\af2\dbch\af31505\loch\f2 -overeenkomstig }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 de GNU Lesser General Public Li\hich\af2\dbch\af31505\loch\f2 cense versie 3. +overeenkomstig }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 de GNU Lesser General Public License versie 3. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 4}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . Het programma wordt verspreid in de hoop dat het van nut is, maar ZONDER ENIGE GA}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 RANTIE}{ @@ -250,14 +261,14 @@ \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 5}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU Lesser General Public License }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 versie 3 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 w\hich\af2\dbch\af31505\loch\f2 ordt gezamenlijk met de Software}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 geleverd}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . }{\rtlch\fcs1 -\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Zo niet, zie dan }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 -\hich\af2\dbch\af31505\loch\f2 <}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 HYPERLINK "}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 wordt gezamenlijk met de Software}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 +\hich\af2\dbch\af31505\loch\f2 geleverd}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Zo niet, zie dan }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 <} +{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 HYPERLINK "}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/lgpl-3.0.en.html}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 " }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b7200000068007400740070003a002f002f007700770077002e0067006e0075002e006f00720067002f006c006900630065006e007300650073002f006c00670070006c002d0033002e0030002e0065006e002e006800 -74006d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000004400e900006e14ec68d800000000000700b2004f000000ec000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +74006d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000004400e900006e14ec68d800000000000700b2004f000000ec00000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/lgpl-3.0.en.html}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\sectdefaultcl\sftnbj {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 >}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid12603449 \hich\af2\dbch\af31505\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 voor de tekst}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 . @@ -272,20 +283,21 @@ \par \par }\pard \ltrpar\ql \li855\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin855\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid13187850 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 B.\tab }{ -\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU GENERAL PUBLIC LICENSE\'94\loch\f2 - versie 3 zoals gepubliceerd door de Free Soft\hich\af2\dbch\af31505\loch\f2 ware Foundation.}{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 +\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU GENERAL PUBLIC LICENSE\'94\loch\f2 ver +\hich\af2\dbch\af31505\loch\f2 sie 3 zoals gepubliceerd door de Free Software Foundation.}{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16073068 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 1. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \loch\f2 is software voor het gebruik bij het toetsen van dijken overeenkomstig het }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 \hich\af2\dbch\af31505\loch\f2 WTI 2017 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname\hich\af2\dbch\af31505\loch\f2 - van haar functionaliteiten. Ieder ander gebruik wordt ten stelligste afgeraden door Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 +voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar functionaliteiten. Ieder ander gebruik wordt ten stelligste afgeraden door Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \par \hich\af2\dbch\af31505\loch\f2 2. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Copyright}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid3020322 \hich\af2\dbch\af31505\loch\f2 \hich\f2 \'a9}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Stichting Deltares, 201}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 6}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 .}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Alle rechten voorbehouden. +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 A\hich\af2\dbch\af31505\loch\f2 lle rechten voorbehouden. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 3}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . U mag het programma }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 zelf verder verspreiden}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 @@ -301,15 +313,15 @@ voor meer details. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 5}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 -\hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU General Public License }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11875882 \hich\af2\dbch\af31505\loch\f2 versie \hich\af2\dbch\af31505\loch\f2 3 }{\rtlch\fcs1 -\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 wordt gezamenlijk met de Software}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 +\hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU General Public License }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11875882 \hich\af2\dbch\af31505\loch\f2 versie 3 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 wordt gezamenlijk met de Software}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 geleverd}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Zo niet, zie dan }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 <} {\field\flddirty{\*\fldinst {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 HYPERLINK "}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid3686156 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/gpl-3.0.en.html}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 " }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b7000000068007400740070003a002f002f007700770077002e0067006e0075002e006f00720067002f006c006900630065006e007300650073002f00670070006c002d0033002e0030002e0065006e002e0068007400 -6d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000477d4c0000945e0000000065002f30000060b30004000000000000000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +6d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000477d4c0000945e0000000065002f30000060b30004000000000000000000d8}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/gpl-3.0.en.html}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\sectdefaultcl\sftnbj {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 >}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 voor de tekst}{ \rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 . @@ -427,8 +439,8 @@ ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000080d7 -33582475d101feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000030f4 +0ba51781d101feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file Index: Ringtoets.sln =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Ringtoets.sln (.../Ringtoets.sln) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets.sln (.../Ringtoets.sln) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -283,6 +283,10 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.InputParameterCalculation.Test", "Ringtoets\Piping\test\Ringtoets.Piping.InputParameterCalculation.Test\Ringtoets.Piping.InputParameterCalculation.Test.csproj", "{74E55618-31E4-429A-81FB-30C16C4891ED}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.InputParameterCalculation.TestUtil", "Ringtoets\Piping\test\Ringtoets.Piping.InputParameterCalculation.TestUtil\Ringtoets.Piping.InputParameterCalculation.TestUtil.csproj", "{DAE86782-E531-42C1-88B2-E0DFED7FCFC9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.InputParameterCalculation.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.InputParameterCalculation.TestUtil.Test\Ringtoets.Piping.InputParameterCalculation.TestUtil.Test.csproj", "{81ADD2CC-0664-4827-9D91-9D7A5221364F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CreateInstaller|x86 = CreateInstaller|x86 @@ -1116,6 +1120,22 @@ {74E55618-31E4-429A-81FB-30C16C4891ED}.Release|x86.Build.0 = Release|x86 {74E55618-31E4-429A-81FB-30C16C4891ED}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 {74E55618-31E4-429A-81FB-30C16C4891ED}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.CreateInstaller|x86.ActiveCfg = Release|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.Debug|x86.ActiveCfg = Debug|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.Debug|x86.Build.0 = Debug|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.Release|x86.ActiveCfg = Release|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.Release|x86.Build.0 = Release|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.CreateInstaller|x86.ActiveCfg = Release|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.Debug|x86.ActiveCfg = Debug|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.Debug|x86.Build.0 = Debug|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.Release|x86.ActiveCfg = Release|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.Release|x86.Build.0 = Release|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86 + {81ADD2CC-0664-4827-9D91-9D7A5221364F}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1194,6 +1214,8 @@ {63EAAA8C-51FE-48E1-81A5-753FB4A47898} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {9FA83BA2-249B-4A66-A501-1C3DA07F8F86} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {74E55618-31E4-429A-81FB-30C16C4891ED} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} + {81ADD2CC-0664-4827-9D91-9D7A5221364F} = {1F0D20C2-7F04-431D-AF22-95A31FD53733} {4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7} = {39EB5D07-C076-484C-9621-B34C4E5BF64C} {3CCB05DB-C7B3-4EF7-B41D-22B6D2A3774E} = {39EB5D07-C076-484C-9621-B34C4E5BF64C} {50963F12-448C-41BA-A62C-CDB0AB8D21E0} = {39EB5D07-C076-484C-9621-B34C4E5BF64C} Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -0,0 +1,127 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU 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 General Public License for more details. +// +// You should have received a copy of the GNU 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 Ringtoets.Piping.Data.Probabilistics; + +namespace Ringtoets.Piping.Data +{ + /// + /// Factory for creating design variables based on probabilistic distributions. + /// + public static class PipingSemiProbabilisticDesignValueFactory + { + #region General parameters + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetSaturatedVolumicWeightOfCoverageLayer(PipingInput parameters) + { + return CreateDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer, 0.05); + } + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetThicknessCoverageLayer(PipingInput parameters) + { + return CreateDesignVariable(parameters.ThicknessCoverageLayer, 0.05); + } + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetPhreaticLevelExit(PipingInput parameters) + { + return CreateDesignVariable(parameters.PhreaticLevelExit, 0.05); + } + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetDampingFactorExit(PipingInput parameters) + { + return CreateDesignVariable(parameters.DampingFactorExit, 0.95); + } + + #endregion + + #region Piping parameters + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetSeepageLength(PipingInput parameters) + { + return CreateDesignVariable(parameters.SeepageLength, 0.05); + } + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetDiameter70(PipingInput parameters) + { + return CreateDesignVariable(parameters.Diameter70, 0.05); + } + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetDarcyPermeability(PipingInput parameters) + { + return CreateDesignVariable(parameters.DarcyPermeability, 0.95); + } + + /// + /// Creates the design variable for . + /// + public static DesignVariable GetThicknessAquiferLayer(PipingInput parameters) + { + return CreateDesignVariable(parameters.ThicknessAquiferLayer, 0.95); + } + + #endregion + + private static DesignVariable CreateDesignVariable(NormalDistribution distribution, double percentile) + { + return new NormalDistributionDesignVariable(distribution) + { + Percentile = percentile + }; + } + + private static DesignVariable CreateDesignVariable(LognormalDistribution distribution, double percentile) + { + return new LognormalDistributionDesignVariable(distribution) + { + Percentile = percentile + }; + } + + private static DesignVariable CreateDesignVariable(ShiftedLognormalDistribution distribution, double percentile) + { + return new ShiftedLognormalDistributionDesignVariable(distribution) + { + Percentile = percentile + }; + } + } +} \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj =================================================================== diff -u -r3bf7e84ac84de7dd0be38be7e9f2372878e733f6 -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision 3bf7e84ac84de7dd0be38be7e9f2372878e733f6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -62,6 +62,7 @@ + Index: Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -0,0 +1,122 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU 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 General Public License for more details. +// +// You should have received a copy of the GNU 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 Core.Common.Base.Data; +using Ringtoets.Piping.Data; +using Ringtoets.Piping.KernelWrapper; +using Ringtoets.Piping.KernelWrapper.SubCalculator; + +namespace Ringtoets.Piping.InputParameterCalculation +{ + public static class InputParameterCalculationService + { + /// + /// The to use for creating piping sub calculators. + /// + public static IPipingSubCalculatorFactory SubCalculatorFactory = new PipingSubCalculatorFactory(); + + /// + /// Calculates the thickness of the coverage layer based on the values of the . + /// + /// The volumetric weight of water. + /// The design value of the phreatic level at the exit point. + /// The l-coordinate of the exit point. + /// A surface line. + /// A soil profile. + /// The thickness of the coverage layer, or if the thickness could not be calculated. + public static double CalculateThicknessCoverageLayer(double waterVolumetricWeight, RoundedDouble phreaticLevelExit, RoundedDouble exitPointL, RingtoetsPipingSurfaceLine surfaceLine, PipingSoilProfile soilProfile) + { + try + { + var calculatorInput = new PipingCalculatorInput( + waterVolumetricWeight, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + phreaticLevelExit, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + exitPointL, + surfaceLine, + soilProfile + ); + return new PipingCalculator(calculatorInput, SubCalculatorFactory).CalculateThicknessCoverageLayer(); + } + catch (PipingCalculatorException) + { + return Double.NaN; + } + } + + /// + /// Calculates the piezometric head at the exit point based on the values of the . + /// + /// The assessment level. + /// The design value of the damping factor at exit point. + /// The design value of the phreatic level at exit point. + /// The piezometric head at the exit point. + public static double CalculatePiezometricHeadAtExit(RoundedDouble assessmentLevel, RoundedDouble dampingFactorExit, RoundedDouble phreaticLevelExit) + { + var calculatorInput = new PipingCalculatorInput( + Double.NaN, + Double.NaN, + Double.NaN, + assessmentLevel, + Double.NaN, + dampingFactorExit, + phreaticLevelExit, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + Double.NaN, + null, + null + ); + return new PipingCalculator(calculatorInput, SubCalculatorFactory).CalculatePiezometricHeadAtExit(); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/Properties/AssemblyInfo.cs =================================================================== diff -u -r65ea41e01d41d77df1e30bf8e850a44de46e870f -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 65ea41e01d41d77df1e30bf8e850a44de46e870f) +++ Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -1,4 +1,25 @@ -using System.Reflection; +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU 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 General Public License for more details. +// +// You should have received a copy of the GNU 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.Reflection; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Ringtoets.Piping.InputParameterCalculation")] Index: Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/Ringtoets.Piping.InputParameterCalculation.csproj =================================================================== diff -u -r65ea41e01d41d77df1e30bf8e850a44de46e870f -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/Ringtoets.Piping.InputParameterCalculation.csproj (.../Ringtoets.Piping.InputParameterCalculation.csproj) (revision 65ea41e01d41d77df1e30bf8e850a44de46e870f) +++ Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/Ringtoets.Piping.InputParameterCalculation.csproj (.../Ringtoets.Piping.InputParameterCalculation.csproj) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -48,14 +48,32 @@ Properties\GlobalAssembly.cs + + + {3BBFD65B-B277-4E50-AE6D-BD24C3434609} + Core.Common.Base + {c90b77da-e421-43cc-b82e-529651bc21ac} Core.Common.Version + + {CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB} + Ringtoets.Piping.Data + + + {d64e4f0e-e341-496f-82b2-941ad202b4e3} + Ringtoets.Piping.KernelWrapper + + + + Copying.licenseheader + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil.Test/packages.config =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil.Test/packages.config (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil.Test/packages.config (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -0,0 +1,4 @@ + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/InputParameterCalculationServiceConfig.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/InputParameterCalculationServiceConfig.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/InputParameterCalculationServiceConfig.cs (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -0,0 +1,47 @@ +using System; +using Ringtoets.Piping.KernelWrapper.SubCalculator; +using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator; + +namespace Ringtoets.Piping.InputParameterCalculation.TestUtil +{ + /// + /// This class can be used to set a temporary + /// for while testing. + /// Disposing an instance of this class will revert the + /// . + /// + /// + /// The following is an example for how to use this class: + /// + /// using(new InputParameterCalculationServiceConfig()) { + /// var testFactory = (TestPipingSubCalculatorFactory) InputParameterCalculationService.SubCalculatorFactory; + /// + /// // Perform tests with testFactory + /// } + /// + /// + public class InputParameterCalculationServiceConfig : IDisposable + { + private readonly IPipingSubCalculatorFactory previousFactory; + + /// + /// Creates a new instance of . + /// Sets a to + /// + /// + public InputParameterCalculationServiceConfig() + { + previousFactory = InputParameterCalculationService.SubCalculatorFactory; + InputParameterCalculationService.SubCalculatorFactory = new TestPipingSubCalculatorFactory(); + } + + /// + /// Reverts the to the value + /// it had at time of construction of the . + /// + public void Dispose() + { + InputParameterCalculationService.SubCalculatorFactory = previousFactory; + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/Properties/AssemblyInfo.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/Properties/AssemblyInfo.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/Properties/AssemblyInfo.cs (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Ringtoets.Piping.InputParameterCalculation.TestUtil")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Deltares")] +[assembly: AssemblyProduct("Ringtoets.Piping.InputParameterCalculation.TestUtil")] +[assembly: AssemblyCopyright("Copyright © Deltares 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("a59b1e07-38ad-419e-a18c-ebc01df0a41a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/Ringtoets.Piping.InputParameterCalculation.TestUtil.csproj =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/Ringtoets.Piping.InputParameterCalculation.TestUtil.csproj (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.TestUtil/Ringtoets.Piping.InputParameterCalculation.TestUtil.csproj (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -0,0 +1,74 @@ + + + + + Debug + x86 + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9} + Library + Properties + Ringtoets.Piping.InputParameterCalculation.TestUtil + Ringtoets.Piping.InputParameterCalculation.TestUtil + v4.0 + 512 + + + true + bin\Debug\ + 4 + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\Release\ + 4 + TRACE + true + none + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\ReleaseForCodeCoverage\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + + + + + + + + + + {97F6406A-6338-4863-92A6-0D5C00A5F7C9} + Ringtoets.Piping.InputParameterCalculation + + + {D64E4F0E-E341-496F-82B2-941AD202B4E3} + Ringtoets.Piping.KernelWrapper + + + {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} + Ringtoets.Piping.KernelWrapper.TestUtil + + + + + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r65ea41e01d41d77df1e30bf8e850a44de46e870f -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 65ea41e01d41d77df1e30bf8e850a44de46e870f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -7,7 +7,6 @@ using NUnit.Framework; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; -using Ringtoets.Piping.KernelWrapper; using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator; using Ringtoets.Piping.Service.TestUtil; @@ -54,84 +53,6 @@ } [Test] - public void CalculateThicknessCoverageLayer_InValidPipingCalculationWithOutput_ReturnsNaN() - { - // Setup - PipingCalculation invalidPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); - - // Make invalid by having surfaceline partially above soil profile: - double highestLevelSurfaceLine = invalidPipingCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z); - var soilProfileTop = highestLevelSurfaceLine - 0.5; - var soilProfileBottom = soilProfileTop - 0.5; - invalidPipingCalculation.InputParameters.SoilProfile = new PipingSoilProfile("A", soilProfileBottom, new[] - { - new PipingSoilLayer(soilProfileTop) - { - IsAquifer = true - } - }, 0); - - // Call - var result = PipingCalculationService.CalculateThicknessCoverageLayer(invalidPipingCalculation.InputParameters); - - // Assert - Assert.IsNaN(result); - } - - [Test] - public void CalculateThicknessCoverageLayer_ValidInput_ReturnsThickness() - { - // Setup - var surfaceLine = new RingtoetsPipingSurfaceLine(); - surfaceLine.SetGeometry(new[] - { - new Point3D(0, 0, 10), - new Point3D(20, 0, 10) - }); - - var soilProfile = new PipingSoilProfile(string.Empty, 0, new[] - { - new PipingSoilLayer(5) - { - IsAquifer = true - }, - new PipingSoilLayer(20) - { - IsAquifer = false - } - }, 0); - - PipingInput input = new PipingInput(new GeneralPipingInput()) - { - ExitPointL = (RoundedDouble) 10, - SurfaceLine = surfaceLine, - SoilProfile = soilProfile - }; - - // Call - var thickness = PipingCalculationService.CalculateThicknessCoverageLayer(input); - - // Assert - Assert.AreEqual(5, thickness); - } - - [Test] - public void CalculatePiezometricHeadAtExit_Always_ReturnsResult() - { - // Setup - PipingInput input = new PipingInput(new GeneralPipingInput()) - { - AssessmentLevel = (RoundedDouble) 0.0 - }; - - // Call - var result = PipingCalculationService.CalculatePiezometricHeadAtExit(input); - - // Assert - Assert.IsFalse(double.IsNaN(result)); - } - - [Test] public void PerformValidatedCalculation_ValidPipingCalculation_LogStartAndEndOfValidatingInputsAndCalculation() { // Setup @@ -227,55 +148,6 @@ } } - [Test] - public void CalculateThicknessCoverageLayer_CompleteInput_InputSetOnSubCalculator() - { - // Setup - PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); - PipingInput input = validPipingCalculation.InputParameters; - - using (new PipingCalculationServiceConfig()) - { - // Call - PipingCalculationService.CalculateThicknessCoverageLayer(validPipingCalculation.InputParameters); - - // Assert - var testFactory = (TestPipingSubCalculatorFactory) PipingCalculationService.SubCalculatorFactory; - var effectiveThicknessCalculator = testFactory.LastCreatedEffectiveThicknessCalculator; - - Assert.AreEqual(input.ExitPointL.Value, effectiveThicknessCalculator.ExitPointXCoordinate); - Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), effectiveThicknessCalculator.PhreaticLevel, - Math.Pow(10.0, -input.PhreaticLevelExit.Mean.NumberOfDecimalPlaces)); - AssertEqualSoilProfiles(input.SoilProfile, effectiveThicknessCalculator.SoilProfile); - AssertEqualSurfaceLines(input.SurfaceLine, effectiveThicknessCalculator.SurfaceLine); - Assert.AreEqual(input.WaterVolumetricWeight, effectiveThicknessCalculator.VolumicWeightOfWater); - } - } - - [Test] - public void CalculatePiezometricHeadAtExit_CompleteInput_InputSetOnSubCalculator() - { - // Setup - PipingCalculation validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); - PipingInput input = validPipingCalculation.InputParameters; - - using (new PipingCalculationServiceConfig()) - { - // Call - PipingCalculationService.CalculatePiezometricHeadAtExit(validPipingCalculation.InputParameters); - - // Assert - var testFactory = (TestPipingSubCalculatorFactory) PipingCalculationService.SubCalculatorFactory; - var piezometricHeadAtExitCalculator = testFactory.LastCreatedPiezometricHeadAtExitCalculator; - - Assert.AreEqual(input.AssessmentLevel.Value, piezometricHeadAtExitCalculator.HRiver); - Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder, - GetAccuracy(input.PhreaticLevelExit.Mean)); - Assert.AreEqual(PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit, - GetAccuracy(input.DampingFactorExit.Mean)); - } - } - private void AssertSubCalculatorInputs(PipingInput input) { var testFactory = (TestPipingSubCalculatorFactory) PipingCalculationService.SubCalculatorFactory; @@ -337,50 +209,5 @@ { return Math.Pow(10.0, -roundedDouble.NumberOfDecimalPlaces); } - - private void AssertEqualSurfaceLines(RingtoetsPipingSurfaceLine pipingSurfaceLine, PipingSurfaceLine otherSurfaceLine) - { - AssertPointsAreEqual(pipingSurfaceLine.DitchDikeSide, otherSurfaceLine.DitchDikeSide); - AssertPointsAreEqual(pipingSurfaceLine.BottomDitchDikeSide, otherSurfaceLine.BottomDitchDikeSide); - AssertPointsAreEqual(pipingSurfaceLine.BottomDitchPolderSide, otherSurfaceLine.BottomDitchPolderSide); - AssertPointsAreEqual(pipingSurfaceLine.DitchPolderSide, otherSurfaceLine.DitchPolderSide); - AssertPointsAreEqual(pipingSurfaceLine.DikeToeAtPolder, otherSurfaceLine.DikeToeAtPolder); - - Assert.AreEqual(pipingSurfaceLine.Points.Length, otherSurfaceLine.Points.Count); - for (int i = 0; i < pipingSurfaceLine.Points.Length; i++) - { - AssertPointsAreEqual(pipingSurfaceLine.Points[i], otherSurfaceLine.Points[i]); - } - } - - private void AssertPointsAreEqual(Point3D point, PipingPoint otherPoint) - { - if (point == null) - { - Assert.IsNull(otherPoint); - return; - } - if (otherPoint == null) - { - Assert.Fail("Expected value for otherPoint."); - } - Assert.AreEqual(point.X, otherPoint.X); - Assert.AreEqual(point.Y, otherPoint.Y); - Assert.AreEqual(point.Z, otherPoint.Z); - } - - private void AssertEqualSoilProfiles(PipingSoilProfile pipingProfile, PipingProfile otherPipingProfile) - { - Assert.AreEqual(pipingProfile.Bottom, otherPipingProfile.BottomLevel); - Assert.AreEqual(pipingProfile.Layers.First().Top, otherPipingProfile.TopLevel); - Assert.AreEqual(pipingProfile.Layers.Last(l => l.IsAquifer).Top, otherPipingProfile.BottomAquiferLayer.TopLevel); - Assert.AreEqual(pipingProfile.Layers.First(l => l.IsAquifer).Top, otherPipingProfile.TopAquiferLayer.TopLevel); - - Assert.AreEqual(pipingProfile.Layers.Count(), otherPipingProfile.Layers.Count); - for (int i = 0; i < pipingProfile.Layers.Count(); i++) - { - Assert.AreEqual(pipingProfile.Layers.ElementAt(i).Top, otherPipingProfile.Layers[i].TopLevel); - } - } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingInputSynchronizerTest.cs =================================================================== diff -u -r65ea41e01d41d77df1e30bf8e850a44de46e870f -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingInputSynchronizerTest.cs (.../PipingInputSynchronizerTest.cs) (revision 65ea41e01d41d77df1e30bf8e850a44de46e870f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingInputSynchronizerTest.cs (.../PipingInputSynchronizerTest.cs) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -5,6 +5,8 @@ using NUnit.Framework; using Ringtoets.HydraRing.Data; using Ringtoets.Piping.Data; +using Ringtoets.Piping.InputParameterCalculation; +using Ringtoets.Piping.InputParameterCalculation.TestUtil; using Ringtoets.Piping.KernelWrapper; using Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator; using Ringtoets.Piping.Service.Properties; @@ -91,7 +93,7 @@ var input = new PipingInput(new GeneralPipingInput()); PipingInputSynchronizer.Synchronize(input); - using (new PipingCalculationServiceConfig()) + using (new InputParameterCalculationServiceConfig()) { // Call input.NotifyObservers(); @@ -101,7 +103,7 @@ Assert.AreEqual(2, result.NumberOfDecimalPlaces); Assert.IsFalse(double.IsNaN(result)); - var factory = (TestPipingSubCalculatorFactory) PipingCalculationService.SubCalculatorFactory; + var factory = (TestPipingSubCalculatorFactory)InputParameterCalculationService.SubCalculatorFactory; var piezometricHeadAtExitCalculator = factory.LastCreatedPiezometricHeadAtExitCalculator; Assert.AreEqual(input.AssessmentLevel.Value, piezometricHeadAtExitCalculator.HRiver); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj =================================================================== diff -u -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d -rbd3d9017ec57de410afdb274e44cd933d670ce86 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision bd3d9017ec57de410afdb274e44cd933d670ce86) @@ -82,6 +82,10 @@ {70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2} Ringtoets.HydraRing.Data + + {97F6406A-6338-4863-92A6-0D5C00A5F7C9} + Ringtoets.Piping.InputParameterCalculation + {D64E4F0E-E341-496F-82B2-941AD202B4E3} Ringtoets.Piping.KernelWrapper @@ -94,6 +98,10 @@ {CE994CC9-6F6A-48AC-B4BE-02C30A21F4DB} Ringtoets.Piping.Data + + {DAE86782-E531-42C1-88B2-E0DFED7FCFC9} + Ringtoets.Piping.InputParameterCalculation.TestUtil + {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} Ringtoets.Piping.KernelWrapper.TestUtil