From 276cd53a7f25a59083719056e6f1298db227549d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Fri, 8 Sep 2017 14:35:44 +0200
Subject: [PATCH] Refactoring Result object
---
.gitignore | 0
nb-configuration.xml | 0
pom.xml | 0
.../deliaradicummodel/DeliaRadicumModel.java | 2 +-
.../DeliaRadicumModelDataMatrix.java | 0
.../model/deliaradicummodel/texts.properties | 0
.../deliaradicummodel/texts_nb.properties | 0
.../DeliaRadicumModelTest.java | 20 +++---
src/test/resources/alnarp_dst_transition.json | 0
src/test/resources/weatherdata_air.json | 0
src/test/resources/weatherdata_both.json | 0
src/test/resources/weatherdata_both_1h.json | 0
.../weatherdata_fjalkinge_sweden.json | 0
.../DeliaRadicumModel$1.class | Bin 878 -> 872 bytes
.../deliaradicummodel/DeliaRadicumModel.class | Bin 10897 -> 10907 bytes
.../DeliaRadicumModelDataMatrix.class | Bin 544 -> 545 bytes
.../deliaradicummodel/texts_nb.properties | 6 +-
...eliaradicummodel.DeliaRadicumModelTest.xml | 67 +++++++++---------
...eliaradicummodel.DeliaRadicumModelTest.txt | 2 +-
.../DeliaRadicumModelTest$1.class | Bin 873 -> 870 bytes
.../DeliaRadicumModelTest.class | Bin 9180 -> 10371 bytes
21 files changed, 49 insertions(+), 48 deletions(-)
mode change 100644 => 100755 .gitignore
mode change 100644 => 100755 nb-configuration.xml
mode change 100644 => 100755 pom.xml
mode change 100644 => 100755 src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
mode change 100644 => 100755 src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
mode change 100644 => 100755 src/main/resources/no/nibio/vips/model/deliaradicummodel/texts.properties
mode change 100644 => 100755 src/main/resources/no/nibio/vips/model/deliaradicummodel/texts_nb.properties
mode change 100644 => 100755 src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
mode change 100644 => 100755 src/test/resources/alnarp_dst_transition.json
mode change 100644 => 100755 src/test/resources/weatherdata_air.json
mode change 100644 => 100755 src/test/resources/weatherdata_both.json
mode change 100644 => 100755 src/test/resources/weatherdata_both_1h.json
mode change 100644 => 100755 src/test/resources/weatherdata_fjalkinge_sweden.json
diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/nb-configuration.xml b/nb-configuration.xml
old mode 100644
new mode 100755
diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
old mode 100644
new mode 100755
index e3cf007..b375ff6
--- a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
@@ -97,7 +97,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{
while(currentDate.compareTo(lastDate) <= 0)
{
Result result = new ResultImpl();
- result.setResultValidTime(currentDate);
+ result.setValidTimeStart(currentDate);
Double airTempSum = this.dataMatrix.getParamDoubleValueForDate(currentDate, DeliaRadicumModelDataMatrix.TMDD4C);
result.setValue(CommonNamespaces.NS_WEATHER,
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.java
old mode 100644
new mode 100755
diff --git a/src/main/resources/no/nibio/vips/model/deliaradicummodel/texts.properties b/src/main/resources/no/nibio/vips/model/deliaradicummodel/texts.properties
old mode 100644
new mode 100755
diff --git a/src/main/resources/no/nibio/vips/model/deliaradicummodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/deliaradicummodel/texts_nb.properties
old mode 100644
new mode 100755
diff --git a/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java b/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
old mode 100644
new mode 100755
index 7b3e91e..62da90e
--- a/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
+++ b/src/test/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.java
@@ -88,11 +88,11 @@ public class DeliaRadicumModelTest {
for(Result result:results)
{
//System.out.println(result.getResultValidTime() + ": " + result.getWarningStatus());
- if(result.getResultValidTime().compareTo(lastGreen) <= 0)
+ if(result.getValidTimeStart().compareTo(lastGreen) <= 0)
{
assertEquals(Result.WARNING_STATUS_NO_RISK, result.getWarningStatus());
}
- else if(result.getResultValidTime().compareTo(lastYellow) <= 0)
+ else if(result.getValidTimeStart().compareTo(lastYellow) <= 0)
{
assertEquals(Result.WARNING_STATUS_MINOR_RISK, result.getWarningStatus());
}
@@ -115,11 +115,11 @@ public class DeliaRadicumModelTest {
for(Result result:results)
{
//System.out.println(result.getResultValidTime() + ": " + result.getWarningStatus());
- if(result.getResultValidTime().compareTo(lastGreen) <= 0)
+ if(result.getValidTimeStart().compareTo(lastGreen) <= 0)
{
assertEquals(Result.WARNING_STATUS_NO_RISK, result.getWarningStatus());
}
- else if(result.getResultValidTime().compareTo(lastYellow) <= 0)
+ else if(result.getValidTimeStart().compareTo(lastYellow) <= 0)
{
assertEquals(Result.WARNING_STATUS_MINOR_RISK, result.getWarningStatus());
}
@@ -143,11 +143,11 @@ public class DeliaRadicumModelTest {
for(Result result:results)
{
//System.out.println(result.getResultValidTime() + ": " + result.getWarningStatus());
- if(result.getResultValidTime().compareTo(lastGreen) <= 0)
+ if(result.getValidTimeStart().compareTo(lastGreen) <= 0)
{
assertEquals(Result.WARNING_STATUS_NO_RISK, result.getWarningStatus());
}
- else if(result.getResultValidTime().compareTo(lastYellow) <= 0)
+ else if(result.getValidTimeStart().compareTo(lastYellow) <= 0)
{
assertEquals(Result.WARNING_STATUS_MINOR_RISK, result.getWarningStatus());
}
@@ -179,11 +179,11 @@ public class DeliaRadicumModelTest {
for(Result result:results)
{
//System.out.println(result.getResultValidTime() + ": " + result.getWarningStatus());
- if(result.getResultValidTime().compareTo(lastGreen) <= 0)
+ if(result.getValidTimeStart().compareTo(lastGreen) <= 0)
{
assertEquals(Result.WARNING_STATUS_NO_RISK, result.getWarningStatus());
}
- else if(result.getResultValidTime().compareTo(lastYellow) <= 0)
+ else if(result.getValidTimeStart().compareTo(lastYellow) <= 0)
{
assertEquals(Result.WARNING_STATUS_MINOR_RISK, result.getWarningStatus());
}
@@ -209,11 +209,11 @@ public class DeliaRadicumModelTest {
for(Result result:results)
{
//System.out.println(result.getResultValidTime() + ": " + result.getWarningStatus());
- if(result.getResultValidTime().compareTo(lastGreen) <= 0)
+ if(result.getValidTimeStart().compareTo(lastGreen) <= 0)
{
assertEquals(Result.WARNING_STATUS_NO_RISK, result.getWarningStatus());
}
- else if(result.getResultValidTime().compareTo(lastYellow) <= 0)
+ else if(result.getValidTimeStart().compareTo(lastYellow) <= 0)
{
assertEquals(Result.WARNING_STATUS_MINOR_RISK, result.getWarningStatus());
}
diff --git a/src/test/resources/alnarp_dst_transition.json b/src/test/resources/alnarp_dst_transition.json
old mode 100644
new mode 100755
diff --git a/src/test/resources/weatherdata_air.json b/src/test/resources/weatherdata_air.json
old mode 100644
new mode 100755
diff --git a/src/test/resources/weatherdata_both.json b/src/test/resources/weatherdata_both.json
old mode 100644
new mode 100755
diff --git a/src/test/resources/weatherdata_both_1h.json b/src/test/resources/weatherdata_both_1h.json
old mode 100644
new mode 100755
diff --git a/src/test/resources/weatherdata_fjalkinge_sweden.json b/src/test/resources/weatherdata_fjalkinge_sweden.json
old mode 100644
new mode 100755
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class
index da25ddea52c83be4f98ea0088fd49382f82b46d1..94c400664dda0086c7fc167ace092a2bc3a3af88 100644
GIT binary patch
delta 51
zcmaFI_JVDLIU`e!&twB8-N|W;qO5tDNtyYZn;A73xpg#r^78e;0+V+!Wiu*HR%7-6
E0HjI}r2qf`
delta 57
zcmaFC_Kt0XIU`fP&tzRD-N|W;q8v$?`Dyt@#o3!17&RIB^fi3)^7Ub2leaKsGm1}E
HVD<n28tf7=
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class
index e3e3ba6f9fc7e459c7008e02eb80e89bd1ea3258..598178ea342eae55a150db83c8e922ffd0588e3e 100644
GIT binary patch
delta 5269
zcmbOjIy<!f)W2Q(7#J9g8MksUJmX?$WO&ZS@PgqbCqo0nD-iJ-M7#kJZ`m9K7{Gvw
z;T^+!kkAKqhL0Q!pEwvkb1^h9d;tl4<zV>6#lXYxorB>AJHt;d1`&o|ApUO<@du>h
zFBgL)!#{S0{~U}AT=fi649~e385x<_8JW2l<QRT&GqNzUaxw5QvavI=b1-snF-S3T
zf&{rhg52zkJX{RwjJzOWJ}!m^Mt&}aT1Ej5MnNuy7a&@QgHf1+QG}C`g;A7?;T@wG
zNL(Dml>iZvAfu$X8R8kGxfm=N>t)y(WkC!%5FyXW(7>p`&Zx-2s01=wnS)UUM5}Tz
zs&O!?gP0l|jG7=?i-S=cMC))c>asKHaWQx?{NiBL=VI_;G~i$~1knN@(~LlbG05}3
z*cnZ@7=jsoaWM37F`6=(u``-;)iYW!TCy`*aWO=KB(AYDT5~bPFxqf21T)&QGunY1
zYR}E+z~~4foIqZ8=3)qEbm3s=1JSM=43j{DZk!D2jP4+>x`MbKTnv$no*<SNDAc?`
zTpxBuUv@@6c1C|L#sJ1ZE`}n8=Uhe%Jd8o?jKLg?As{D*axjK*F_eL#B%Cn<q&1SA
zF^YpRnv0>9;W;~F3_D}&WPK(XE?J+veEq!4q|E%y5loznQr13MiDilUr6rj;`aYS(
zB{m58I%Z8qB=wWGu-I^E!lftIF)K`#WnChrkJE(7_gFRDW7rw(*cs#48D-fS{<Aa2
zvoj{JGxD%AnzJ(|GBR+vRwSnulw{`T6*DpzYG~p!OG1(>J+;I)KP5HCGlh{sUIXEn
z%}3aH8M$>d5U#t=o`LMx`|JvnOE{dl6c8%>1;r-c;t=9ZVrMjAXS8BxOlD_Hnf#OE
zmCjVgRCdNh9>z4rbRLFQhBh9Cb`a44B03q`*clT*av3}fT@2lm`MG?e*g||=TuhvK
z8169K<zbl2FoltUEyT;$(7=U<F_STik%1G!b1`vdWDrIKxMNXKVkIclc^IZLOygn9
zX3XJX%w^2sVd!D#<zdWY%%8lGOVuHchp~XMkdZ+i7Ipe%nFYoAsd*)tC6)R?sl}x^
zC7!tjIqZz_Jd8z*#XO89jHQeW$}r`V4Y<`M${5Re7%Lbnc^Io0s~H*8;gWUC^7TB7
zHH@`9jAe{<JPdmn_VO^+Gwf$%;DC6`Cj`z64Pj*9hWiC1f#8LP@Gv$owDB-Df{bcn
zZ02EX0dYYA$k@i%&coQj*vZ4##aPV9AcP15=fs>;*SwU(B9MGH4`UC=`^^k3j0}=6
zCqlfN3yOGsaP%`WFs0`4FzjPEz{tRomzbN%!`RE%w^@jXg<0$<NRT@vwK%yb6P&Pk
z7>+R<n5@Gu$$XsQz+?~pa<hKM35<-+N;+JeO3C?oX_@H(iA9OIsU@jJ#Y$GyT%4Rr
z`ANm8MP-TLbg5(&&Be)C%{7@(z>tlTlao^^b@Dz*aSkObr4U~w9j?i-0^*Wj@v_96
z(o`iYLp?(-PR?2#Y`P||7vKhIP)F8apl1ovz{SZK%f(sCRm;W0(8tiv!!U`VfAR+b
z1Dzxu#)*uR7#Re>p_Y@Fm#!aNQk0pO&dxZQhj9wyR7M6lSXfQ=7Yxam$~cXOaXRA+
zMg~5x7I^OFVVuc0i=8o<hjBLJ93IBGjPrOH=QHf*VO#);u7#lZS;V-Qhj9rg;+BF^
z<1)tOJd7(qX=)|oDjvqwjB6MfjNq2>3F&Ymcy2;EoVswiIw5tj6duO4Ami78GJy_U
zYK5?xwS;eGadBo|x<YwsVo647kwQvhNuokxi2@H}KjV5v1|};7cE$}nj2js@@i1;?
z+``Bp4cC86D25Zk(-T%h;w1>%a3T`-eRlcHKZUayg#?RJOTrR!GE+h_b5ny$5{pVE
zmy702{vi5^lcOXb5}cbKh%I1YlTA-8@kyNAAR@)6JNcKW>SS#RuE`D3<@F5=jSP$o
zwhUYhk_^oZEes3{LZH$COt&+%f$0t?-3g_;7`ho47??o$8BF&v^fNFrOaQYdGBAOn
z7==HXVG08SgCGMVs6b#~WSGvtz);P=%)rRNFu6>|fpNy<?J~;hGZ`2dctBzdmJG8P
zW-~A_Ffz<xn9INnQqTOCft`Vyfr0VuWJXzE=DCdXCI`yOGYU;Elhv;0IL06<$tI*M
zBrM4)$+3+=Wha9w3j<h$SCUn03xj};5brhywF3<5+ZZ&qF=&G2A>x7%aVt)+azRPX
zV+;b4tdg7%h07UO7{Q7q*|fGXXl-NA7Shq$!oaqTK^Gxh4;I(c+QPsN69<_sB)E-1
z=oo_`LaV;k76ulW5`?gU))od<nD8bBLn|&xj$;fWAfFgPbQrf!pTi&`$-a#NB*3<f
z!MJ_;YzB@^3??A82}p`r!E#87*}(!}#imwVl5CP(I~mNF7_=qXb~2bVF@#I9=xk%K
zkYwRt*~VZc$+C^X+IRWC1nmtB3=Av`GZ+{c4lx)^o-SuvU(S%pP{okWP|uLV(8Q3(
z(8o}~FpHs(VLn4K!%BuyhBXYu3>z707!EMhGn`?lVYtZ9#PEQjnc+P{8^ceAW`=(Z
zU5ug(-HbX6J&YC%eT@DL{fuc0lNhrZCNnlOOkteFFr9Ha!%W8Y46_*bG0bH=%rKwv
z48uaks|<@7Z!;{ZXMDu4jPV7-a>myTD;Pj&rGSB(A(FA5VIISL1~!IV#%hKI4BZUu
z3{8w_3=0{$88{doFmf;~Vpz<;$(YSh%dmu@je!f4f}p8Oh4CcAQgF)EVLZsNjA1zg
z6N3rkPKFf>%Ndv%Y#BE&tYlclz{23cxRhZvL;V^CR))3EBnr{Gj)9S3Jp%*7ItE^u
z{|wp;Z0rmh*cmpmGi(B*&Fl<Y7#RLBWUw=AWoOvN&amx2gBt@ErXsjJJHvJcW-xCD
zJHw9u3=BxB>)~dC6@ZKbDQ5xmK+4$}cKl|@`NJT^&ahK}MO1+0KZ81UCo${-M=m2n
z88pxCW?%$WkkFi|$G`~Ag)EyGY(U9?37ib-*}#Hp!9fqnrYz8aWMtUKupg?~kbw!T
zj$KR0ZX1I=LO(?NCM50bNZJoTwc9W-GcYkQFmPxIIcRTVa75^b+P@uafEYv()Bpws
z4u*pahrrH040nkxn9sn#EaZeR1>%Z5U_&6DV1^pP$Z!OUR%f`@dIpHz^H}vBh3iEP
z02jD^sP-#J+7SV8lmSZsxS|9A%>J8T18@hxF&r*&LwCtNutAVOK)B=>HkY_-Z)2!O
ziVH|cJO&$p+a<?wxWoh9B`?4Rp}XWbs!Qr2slpQ_P@sYO7Hj}+mz;pRBmkN`<#sc8
zMQ&&C7V_D~;Jb;zW*dX{HU?iIzikY@+Zg;24&-BCW?*3W#K6x`|D8dW;S<;*h)d<*
z3FjokDF!A`CB>q|z{<eMz`$g$wVOdCayx_QR)zosGf-<c15f03hM=ts0=pT4Beyez
z_-bhjg>GXAJHQaWgCSxogT!uz$jI#sQGPnwLebk8!ge#nL~3nkh~36u5_f<h-ik$%
zWhX-dBZC#IB<oIwL`H_04BtVlBu0h<4C+>Fl5E=;lC9X8%s4=mMapD<RaueLZ47BM
z8N`^)IF>UANU{s1Z(~TC+@PvjpRtJ{a~ng}Oa>vXEerv$3Sl`zmL!`l$e?VkEesOd
z7;?5T<bvumu#gZhh{{{e;0mHqObA4npn=Z>L6FY8<qY-A%m0HbXHeZNbetgt>UWT1
zKsF2T?_gkN*}=fPjUgZ6-vmYmkQbpIR|44w^*B4&f$ZBDvW0j-KF?eJ|JHH_AuHD1
z3`LQWtlJohw=<ON2Pp#A%EuWpcQe$3Lt1MKLm)QWjxm^m0+uK%1#w%sk%5IVn{gN8
zUWNiFUC4NYNry?Fp`aehD1=tDn;3K$7#M{axEVzl#2CdG6d5HLG#RBCEEyFT92pfE
zA{dnz${AG{ZZN7dJY&>k_{ylw$j+$4D9)(MD8;DHsKIE+XwGQN=*eip7|CeL7{h4A
z7|&?On9b<OSi|VT*udz@*v#n2*um(=xSY|0v3@(FC*v+gAI80mUX1%0y&2Ci`ZL~O
z3}SrA7|QsTF^us8V-Vw4#&E`8jFC)|jL}S*j4@0)j0sHojB!kcjPXo%j49y!P{qK*
zP|om_;WWcy1~$g!3<3;i7#1_IGj=c-F`Q-SXJBRA&%n!Yj^R85E0ZK#_G>+ZIYgSt
z5GD=EI?!yzz+}&Gf#D(pBZDTB7{euo%M45mj*R~pt}t9>U}lJ5e9mx<p`U>TTqP?o
zFheby$iT|@6>RQA23Dx5i3}{@YC4!f=s!auv`W0r&QO1Yo#7_9zP<&jrtR1nwzD(r
zVC3hKl2MWQ!JzVsf$1-UAw<DX1`Q{6hTD998O%@x;B{#c0~4sD3@Hd0OBpyAI2afh
z7J!nR_BI9~KPaQriUpL~b}&d<P1e-pt)I(K4wBK;hBialCE1TNsPASdi-eU><=Ys1
zb+<882vu%l@CB7p+Zg<}GgR#d<su_KP|DNL+QPuSjln2=2Sau84hAkOHn5R8AQd%|
zth%7~9V?`L$GVNd+Hd*)wv7x749pBO80r}q>=^hN7#MRHI2m&pgc<V~WEcw=lo$&c
zv>A&TEE!7}>=?@!k{Bx)>KLmSIvJ}O`Wb5&rZLts%weo!n9o=bP60s-91NBW$qe^E
z@ecAfED{+OFx&^%%nS?*7#=VjVqjw6WSGwI5ZuHPX6UU4x3*XqWEfh&tu0mtC5AeN
zM-1HzY~VOkXJG!%pv1rqZZtt!Iq=5SHU@@24EF2{+kY|Gz@wpzfrH^O!!&4fLKR$m
zGcfS(W~hx6s@u*`znQ@X<ab7Jn}&@+o{@op!IpuE;R(3&@|2+o)aYVhWQYL|EiwQA
Dh9Y>l
delta 5437
zcmbOoIx)2V)W2Q(7#J9g8TWHAyy0SKVR*~M@Q&d<CqpyC2N3ZQM0^4fpV=G)7{Gvw
z;S0l8kkB`FhVL8<KR6hEaxpYB`~nI6=3w~4#lXYxmxJLSJHvl21`$REE(RV(Mi9Zo
z$<WNm%*9~B$imLZ%E8FSRnH*B@Ro~_osol`k&}x-j*)?zk&BTVq?m_`p_!4Fi=ly$
zkBdQyksl->z|JVh!6*ch7G`G@;bPEa6a`6&aWZl-igPi1VU*xvc*iIS;!1%CX>LX?
zMj38~3`SXywQ}r?@*r9PL@07HG}kjKu`?=jFsgtoQ{`Y(1JUXnj2aw_njoeY2ctHK
z*5P2(1<`sOjQZ@123!oTj0_x%h9KIAgVC6S(S(E1l!MWXgVCIW(Sn1~l7rETgVCCU
z(T0Q3mV?obgVCOY(Sd`}5u}3;6bw!v!nq#g6$W-j7cPbvMg|UselA8=MmKgwcP>T`
zMo)G|FD`~8koX;TMsF^LR7M|=I$w51KaiLFxfuf(13^R(C?tZp7!nvmI2a~^=ui%Z
zsUX2HP6kcJa8RIxg18YN^CCg4D3Hz3#vpzSJ7X+6V;nnUJQrgEV<HzrH7HJ!7?VLt
zQrH<&IT+Kp7#bMfvNNW$GiFTIW0K)j@X5>9Ps+?s%P%U<o}9-fHaUywv#gy@R$^JA
zerZW&j=oQ3afuCzst+s*o2N5#GNNgoC@egAFN-Fx4w~X4vPO7~1L+H3W1akrRlql$
zozah-F_WE9o}H1EoiU4@F`J!Hgq_iyoiT@zfy=cbIkli9Ge57GoiUe@!9+uo7?UHF
z^NZ5;@={BZQWNuv^@8(Di;`1)Qp-|v9P{$>OA^5bGBSuj%*sj3OV{@=OD!tOOi8t7
zWZ+6qE%D7yNzL(0VPsI!&_wp#<~%lDMm~KFWU<LV*cB!(WA{J{hac?8yviu*QaLnu
z^Vk_(*crXp8S~j03ntIvc%?Igv5=iHhljC<v6zRUgQ1g$p$kNGgNPo6PIks@kX#85
zLoY+$<PDrYkt`v;E-pL_j~E{FFic~Z&d9(P;^k{-;KIXL%2>w8zz*TLFfs@u;?%LI
zD6tY0u{;bj7-sS?mNQoHFjg{F@G$f<OyFUxVytFl5TD%0Dn7Y@i(4d<hp~pSmXSdT
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
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class
index 18e6d2c0a737d3767d81e92035b34f35a564fac1..f7e33768c7b326ec6fee16274df3dd84f5235d16 100644
GIT binary patch
delta 46
zcmZ3$vXEthI6GU2uZxR`^F$dfF3u1yUqb^BZ=;_qBd1hezJ6Y2QfB_-a>kVa7Yz*L
delta 45
zcmZ3;vVdiRI4ettuZzn>IV}$M5HDXt0~eQ#L9&cIvU&OXNtyX+`9;OqlPefk0ss=t
B4M_k1
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/texts_nb.properties b/target/classes/no/nibio/vips/model/deliaradicummodel/texts_nb.properties
index 2ac9a7b..5dca6a0 100644
--- a/target/classes/no/nibio/vips/model/deliaradicummodel/texts_nb.properties
+++ b/target/classes/no/nibio/vips/model/deliaradicummodel/texts_nb.properties
@@ -15,7 +15,7 @@
# along with DeliaRadicumModel. If not, see <http://www.nibio.no/licenses/>.
#
-name=Delia radicum-modell
-description=TODO: Add description
-statusInterpretation=TODO: Add warning status interpretation
+name=Liten k\u00e5lflue-modell
+description=<h2>Modellbeskrivelse</h2>\n<p>Modellen er en svermetidspunktmodell, og gir informasjon om antatt tid for begynnende og fortsatt egglegging hos liten kålflue i kålvekster. Modellen gjelder kun liten kålflue (ikke stor kålflue).</p>\n<p>Grunnlaget for varslingen er data fra studier av klekke og eggleggingstid hos kålfluene i Norgesprosjektet (LR, 1999-2001), Nye metoder for bekjempelse av kålfluer (forskerprosjekt, NFR, 2004-2007) samt et brukerstyrt prosjekt i regi av Norges Gartnerforbund (2005-2007). Dette er publisert i Johansen og Meadow (2002, 2005, 2006), Johansen (2007) og Meadow m. flere (2008). Kålfluene begynner å legge egg 5-7 dager etter klekking. Våre data tilsier at begynnende egglegging i gjennomsnitt krever en temperatursum på rundt 160 graddager (døgngrader) basert på jordtemperaturer (10 cm) (døgngrader > 4 °C). Basert på standard lufttemperaturer (2 m over bakken) de samme stedene, ble begynnende egglegging registrert når gjennomsnittlig temperatursum passerte ca 210 graddager. Resultatene understøttes av britiske observasjoner (Collier og Finch, 1985, 179 og 230 graddager til 50 % klekking, for jord og lufttemperaturer). Våre beregninger viste til dels stor variasjon og varslingen vil dermed bare være rådgivende. Bruk av denne varslingsmodellen bør kombineres med direkte eggobservasjoner i åkeren for å få begrep om angrepsgraden også.</p>\n<p>Det benyttes historiske værdata og værprognoser (2 dagers) i modellen. Målte parametere som inngår i modellen er standard lufttemperatur (TM) eller jordtemperatur i 10 cm (TMJ 10), timesverdier. Jordtemperatur benyttes dersom denne er tilgjengelig. Beregnede parametere: Døgnmiddelverdier med 4 °C basistemperatur (dvs. døgnmiddel minus 4 °C). 4 °C er en teoretisk beregnet nedre temperatursum for post-diapauseutvikling.</p>\n<p>Modellen er utviklet av Dr. Tor J. Johansen, NIBIO.</p>\n<h2>Tolking av varsel</h2>\n<p>Varsel kan beregnes enten basert på jordtemperatur eller lufttemperatur. Der værstasjonen måler jordtemperatur i tillegg til lufttemperatur, er det jordtemperatur som blir benyttet i varslet som presenteres på kartsiden og i tabellen under grafen. I grafen vil man kunne se både jordtemperatur og lufttemperatur samt døgngradberegninger og terskelverdier tilknyttet disse.\u0008</p>\n<ul>\n<li>Grønne bokser betyr at det ikke er forventet egglegging. Temperatursum for sverming er ikke oppnådd. Grønne bokser presenteres kun i perioden før forventet påbegynt egglegging.</li>\n<li>Gule bokser betyr at første egglegging nærmer seg. Vær observant og sjekk i egen åker. Gule bokser presenteres første gang ved oppnådd 140 døgngrader (jordtemperatur) eller 185 døgngrader (lufttemperatur). Dette tilsvarer ca to normale vårdager før forventet begynnende egglegging.</li>\n<li>Røde bokser betyr at man kan forvente påbegynt egglegging. Kravet til temperatursum er oppnådd; 160 døgngrader (jordtemperatur) eller 210 døgngrader (lufttemperatur)</li>\n</ul>\n<p>Den grafiske presentasjonen viser utviklingen av døgngradsberegningen som ligger til grunn for de grønne, gule og røde varslene (linjene: «Døgngrader basistemperatur 4 grader Celsius» og «Middeltemperatur i jord, 10 cm dybde, basistemp 4 grader Celsius»). Grafen viser rette horisontale linjer for terskelverdiene. Det er et sett med terskelverdier tilknyttet jordtemperatur (på de værstasjoner dette måles) og et sett terskelverdier tilknyttet lufttemperatur.</p>\n<h3>Jordtemperatur</h3>\n<p>«Nedre terskel for aggregert jordtemperatur» tilsvarer terskelen der varsel går fra grønt til gult basert på jordtemperatur (140 døgngrader). «Øvre terskel for aggregert jordtemperatur» tilsvarer terskelen der varsel går fra gult til rødt basert på jordtemperatur (160 døgngrader). Når linjen «Middeltemperatur i jord, 10 cm dybde, basistemp 4 grader Celsius» krysser en av linjene for aggregert jordtemperatur, vil varslet nå neste nivå og fargen på varslingsboksene på kartsiden i VIPS endres.</p>\n<h3>Lufttemperatur</h3>\n<p>(benyttes dersom jordtemperatur ikke er tilgjengelig) «Nedre terskel for aggregert lufttemperatur» tilsvarer terskelen der varsel går fra grønt til gult basert på lufttemperatur (185 døgngrader). «Øvre terskel for aggregert lufttemperatur» tilsvarer terskelen der varsel går fra gult til rødt basert på lufttemperatur (210 døgngrader). Når linjen «Døgngrader basistemperatur 4 grader Celsius» krysser en av linjene for aggregert lufttemperatur, vil varslet nå neste nivå og fargen på varslingsboksene på kartsiden i VIPS endres.</p>\n<p>Vær klar over at i områder med dekke (plast, enkel og dobbel fiberduk el. lign.) (enten på samme jorde eller nabojorder) året før, kan svermingen starte tidligere på grunn av høyere jordtemperatur under dekket.</p>\n<p>Bruk av denne varslingsmodellen bør kombineres med direkte eggobservasjoner i åkeren. Både på grunn av stor variasjon og for å få et inntrykk av angrepsgraden.</p>\n<p>I Nord-Norge vil stor kålflue normalt starte egglegging 10-14 dager etter liten kålflue. For Sør-Norge er det ikke en slik sammenheng.</p>\n<h2>Varslingssesong – oppstart og avslutning av varsel</h2>\n<h3>Starttidspunkt</h3>\n<p>Når jordtemperaturen begynner å bevege seg over 0, senest når middeltemperatur i jord (10cm) (TMJ 10) for døgnet overstiger 4 °C. Rent teknisk er modellens startdato 1. mars (når det er telefritt/snøfritt etter 1. mars).</p>\n<h3>Sluttidspunkt</h3>\n<p>1. juli fra Trøndelag og sørover, 15. juli fra Nordland og nordover</p>\n<h2>Utprøving og validering av modellen</h2>\n<h3>Nasjonalt</h3>\n<p>Modellen er ikke validert etter at den ble tatt i bruk i VIPS i 2008, men bakgrunn for modellen er norske data for klekketidspunkt og eggleggingstidspunkt ulike steder i landet.</p>\n<h3>Internasjonalt</h3>\n<p>Ikke aktuelt da modellen er basert på norske data. Det foreligger imidlertid informasjon om klekketidspunkter fra andre land (Collier & Finch, 1985) og liknende døgngradsmodeller er laget og benyttet internasjonalt.</p>\n<h2>Referanser</h2>\n<p>Johansen, T.J. & R. Meadow 2002. Bekjempelse av kålfluene - fra teori til praksis. Grønn forskning 2/2002: 117-122.</p>\n<p>Johansen, T.J. & R. Meadow 2005. Emergence patterns of Norwegian brassica root fly populations. IOBC/WPRS Bulletin 28 (4): 25-29.</p>\n<p>Johansen TJ og R. Meadow 2006. Population differences in emergence of brassica root flies (Diptera: Anthomyiidae). Environmental Entomology 35: 1161-1165.</p>\n<p>Johansen, T.J. 2007. Kålfluene – biologi og mulige tiltak. Bioforsk Fokus 2 (13): 33-35.</p>\n<p>Meadow, R., T.J. Johansen, R. Seljåsen og S. Haukeland 2008. Hva nå lille flue? Oppsummering fra kålflueprosjekter. Bioforsk Fokus 3 (1): 10-12.</p>\n<p>Collier, R. and S. Finch 1985. Accumulated temperatures for predicting the time of emergence in the spring of the cabbage fly, Delia radicum (L.) (Diptera: Anthomyiidae)</p>\n<p>Tiilikkala, K. and H. Ojanen 1999. Use of geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</p>\n<h2>Kontaktpersoner</h2>\n<p><a href="http://www.nibio.no/ansatte/tor_johansen" target="_blank">Tor J. Johansen</a> og <a href="http://www.nibio.no/ansatte/annette_folkedalschjll" target="_blank">Annette F. Schjøll</a> </p>\n<h2>Mer informasjon</h2>\n<p><a href="http://leksikon.nibio.no/vieworganism.php?organismId=1_338&cropGroupId=-1&cropId=-1&pestGroupId=-1&showMacroOrganisms=false" target="_blank">Kålflue i plantevernleksikonet</a></p>
+statusInterpretation=<h2>Forklaring til grafen</h2>\n<p>Den grafiske presentasjonen viser utviklingen av døgngradsberegningen som ligger til grunn for de grønne, gule og røde varslene (linjene: «Døgngrader basistemperatur 4 grader Celsius» og «Middeltemperatur i jord, 10 cm dybde, basistemp 4 grader Celsius»). Grafen viser rette horisontale linjer for terskelverdiene. Det er et sett med terskelverdier tilknyttet jordtemperatur (på de værstasjoner dette måles) og et sett terskelverdier tilknyttet lufttemperatur.</p>\n<p>«Nedre terskel for aggregert jordtemperatur» tilsvarer terskelen der varsel går fra grønt til gult basert på jordtemperatur (140 døgngrader). «Øvre terskel for aggregert jordtemperatur» tilsvarer terskelen der varsel går fra gult til rødt basert på jordtemperatur (160 døgngrader). Når linjen «Middeltemperatur i jord, 10 cm dybde, basistemp 4 grader Celsius» krysser en av linjene for aggregert jordtemperatur, vil varslet nå neste nivå og fargen på varslingsboksene på kartsiden i VIPS endres.</p>\n<p>«Nedre terskel for aggregert lufttemperatur» tilsvarer terskelen der varsel går fra grønt til gult basert på lufttemperatur (185 døgngrader). «Øvre terskel for aggregert lufttemperatur» tilsvarer terskelen der varsel går fra gult til rødt basert på lufttemperatur (210 døgngrader).</p>\n<h2>Forklaring til tabellen</h2>\n<p>Når varselstatus er grønn, betyr dette at svermingen enda ikke har begynt og at det ikke er forventet egglegging.</p>\n<p>Når varselstatus er gul, betyr dette at svermingen er i startfasen og at første egglegging nærmer seg. Vær observant og sjekk egen åker.</p>\n<p>Når varselstatus er rød, betyr dette at det er forventet påbegynt egglegging. Kravet for sverming er oppnådd.</p>\n<p>Når varselstatus er grå, betyr dette at svermingen av 1. generasjon er over og varslingen er avsluttet.</p>\n<p> Vær klar over at i områder med dekke (plast, enkel og dobbel fiberduk el. lign.) (enten på samme jorde eller nabojorder) året før, kan svermingen starte tidligere på grunn av høyere jordtemperatur under dekket.</p>\n<p>Bruk av denne varslingsmodellen bør kombineres med direkte eggobservasjoner i egen åker. Både på grunn av stor variasjon og for å få et inntrykk av angrepsgraden.</p>
usage=TODO: Add usage
diff --git a/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml b/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
index 4266fea..236acfd 100644
--- a/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
+++ b/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.752" errors="0" skipped="0" tests="14" name="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest">
+<testsuite tests="15" failures="0" name="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" time="0.82" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64"/>
- <property name="java.vm.version" value="24.75-b04"/>
+ <property name="sun.boot.library.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64"/>
+ <property name="java.vm.version" value="25.131-b11"/>
<property name="java.vm.vendor" value="Oracle Corporation"/>
<property name="java.vendor.url" value="http://java.oracle.com/"/>
<property name="path.separator" value=":"/>
@@ -15,44 +15,44 @@
<property name="sun.os.patch.level" value="unknown"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel"/>
- <property name="java.runtime.version" value="1.7.0_75-b13"/>
+ <property name="java.runtime.version" value="1.8.0_131-8u131-b11-2ubuntu1.16.04.3-b11"/>
<property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/endorsed"/>
+ <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/endorsed"/>
<property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value="
"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Linux"/>
- <property name="maven.ext.class.path" value="/home/treinar/bin/netbeans-8.0/java/maven-nblib/netbeans-eventspy.jar"/>
- <property name="classworlds.conf" value="/home/treinar/bin/netbeans-8.0/java/maven/bin/m2.conf"/>
+ <property name="maven.ext.class.path" value="/home/treinar/bin/netbeans-8.2/java/maven-nblib/netbeans-eventspy.jar"/>
+ <property name="classworlds.conf" value="/home/treinar/bin/netbeans-8.2/java/maven/bin/m2.conf"/>
<property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/default-java/jre/lib/amd64:/usr/lib/jvm/default-java/jre/lib/i386::/usr/java/packages/lib/amd64:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
+ <property name="java.library.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/i386::/usr/java/packages/lib/amd64:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="51.0"/>
+ <property name="java.class.version" value="52.0"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
- <property name="os.version" value="3.13.0-46-generic"/>
+ <property name="os.version" value="4.4.0-93-generic"/>
<property name="user.home" value="/home/treinar"/>
<property name="user.timezone" value="Europe/Oslo"/>
<property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="file.encoding" value="UTF-8"/>
- <property name="java.specification.version" value="1.7"/>
+ <property name="java.specification.version" value="1.8"/>
<property name="user.name" value="treinar"/>
- <property name="java.class.path" value="/home/treinar/bin/netbeans-8.0/java/maven/boot/plexus-classworlds-2.4.jar"/>
- <property name="java.vm.specification.version" value="1.7"/>
+ <property name="java.class.path" value="/home/treinar/bin/netbeans-8.2/java/maven/boot/plexus-classworlds-2.4.jar"/>
+ <property name="java.vm.specification.version" value="1.8"/>
<property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-7-openjdk-amd64/jre"/>
- <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dmaven.ext.class.path=/home/treinar/bin/netbeans-8.0/java/maven-nblib/netbeans-eventspy.jar test"/>
+ <property name="java.home" value="/usr/lib/jvm/java-8-openjdk-amd64/jre"/>
+ <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dmaven.ext.class.path=/home/treinar/bin/netbeans-8.2/java/maven-nblib/netbeans-eventspy.jar clean install"/>
<property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="user.language" value="en"/>
<property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
<property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.7.0_75"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext"/>
+ <property name="java.version" value="1.8.0_131"/>
+ <property name="java.ext.dirs" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext"/>
<property name="securerandom.source" value="file:/dev/./urandom"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/resources.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jsse.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/charsets.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rhino.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jfr.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/classes"/>
+ <property name="sun.boot.class.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/resources.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jsse.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jce.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/charsets.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jfr.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/classes"/>
<property name="java.vendor" value="Oracle Corporation"/>
- <property name="maven.home" value="/home/treinar/bin/netbeans-8.0/java/maven"/>
+ <property name="maven.home" value="/home/treinar/bin/netbeans-8.2/java/maven"/>
<property name="file.separator" value="/"/>
<property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
<property name="sun.cpu.endian" value="little"/>
@@ -60,18 +60,19 @@
<property name="sun.desktop" value="gnome"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
- <testcase time="0.006" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelId"/>
- <testcase time="0.004" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_0args"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_String"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetLicense"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetCopyright"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_0args"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String"/>
- <testcase time="0.001" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_0args"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_String"/>
- <testcase time="0.001" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_0args"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_String"/>
- <testcase time="0" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetSampleConfig"/>
- <testcase time="0.408" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testSetConfiguration"/>
- <testcase time="0.287" classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testAcceptance"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetSampleConfig" time="0.004"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testSetConfiguration" time="0.303"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testAcceptance" time="0.358"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testWithSwedishData" time="0.108"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelId" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_0args" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_String" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetLicense" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetCopyright" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_0args" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_0args" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_String" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_0args" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_String" time="0"/>
</testsuite>
\ No newline at end of file
diff --git a/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt b/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
index 9e0dd32..aa2f687 100644
--- a/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
+++ b/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest
-------------------------------------------------------------------------------
-Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.752 sec
+Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.819 sec
diff --git a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class
index 41f19fd4b7ff71bd1cf76f00c588ca5f2e0c22c4..3447d918192e39f6aa26ff816e6c80fb8ac626d5 100644
GIT binary patch
delta 48
zcmaFK_Ka=AG$uJ)4WF#UvPAuy#JqI<;F6-uymV_#pS*niyv(G`{K?yyG8v~&R%G@7
E0I|psB>(^b
delta 51
zcmaFH_L6PGG$us{4WF#UvPAuy#JqI<;F6-uymV_#pS*niq|E%Z{G#IQ$y=B*87(Kv
HF?#?2>FN>{
diff --git a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class
index 5eae17e199459004889c863bc4d0d167ef3ce77e..f715a32d168d8baf5fd23837cd7c9a6919d9a95d 100644
GIT binary patch
literal 10371
zcmX^0Z`VEs1_oosJ}!nFhBKTDXBp0MFw}7|oM*Ve&Tx^7ftBG52g4;UhHQq*AkGyK
zag~GN8W+QLh8tWAd<-|)8E%2-+aTf&h`7tmaF5|WH^T#lhaln+JHumc22qA5Tnv#6
zPdOPx8J>Z-&$$?0FuVkDUxA3%91L$b7~XO)%;I2p$HDNPgW&@gg9F1y4u(%044*j|
zzOXZV<zV>6#h}jc9pr`|Al6R~hF=^Ezd`&zAmT3v!#@!HpM#Nsi-DDqk%N&5L^Fd3
z77j*M5X}Z6*f|(EKr|<a;NoE92GKkmjJ)iOd?0(za5Atm@^djbFbc3U3UV>zFbZ)o
z3NwmuF}N^_vNMWtF?cYX;bIhLl;C2NWRzlOlxAm?;bQP*IK$2;%f;Z&aE6P)hf$7;
z!H3~K2g5oLM;=5durn%hF@!NHaWVKaDzh`HursQ1F+_osM=`2#Fsg$TX>c)WGHP)#
zL@{b}FzSG4T@FS)kc>WvW5CUDkI|5W(TI!Dn9+oTVHZ22DLbPXJEJ)x1CM83UTTqZ
zPGWI!YB3`Nn@wh3W{Djm1G9!^7$XCVbAC!HBLlxrW?rgaX>L+#QAlD^PAVgVkWYSc
zVoq3MQ6`8F6=W&N$Sh`Lu=UBy*U!sL%FNd<%Pc6?&&^Ls&CyRu&B;tGN=(U2F3p9A
zxPU~0AR@jXH6f|RCDx1#T*av+p#@+kF)~O7mFAUX=B9>a7H1~qq&nv1<(DLuWaj4;
zGct(#<QJvuXO-q<mgqaBrsWr<f;Cw)GVqq9CKkEmm*;^67#YNnR63@WKs{{D$iND=
z3+x{>qpTSjIAEqQG6<p@V9m(DSCU#>;+UMAT2PXhmz>JTz*dx6T$)qD$RLXr0;zc=
znI)C_L11Z+!I^o*P(7AtN+Cf*L||DnGO#7*=cQ$)GcstR83MHr9H`D<HKj%1K(l6K
zV23!en2|xiCo8cmQNOe#Ge_Si6CCu+$%#3P3?fJp&WSmxc`1oS){G3CIf=z3?nSAo
zd8m3_5=&A+(FT%^OwGy3F9!!Wa{8z&NQI^meI&C%mfB!<Iy9*4Kyevdl9-(Bn^*ug
z0hDeTF0wQ7u`^n*Gu#4a2upT`$BYbIt`(rD03{7}Mk|mL5vc>3vV=h~7M@v>5nP^{
zl3ASLl30=mjYs#?5^!*NrZ6&ardAX{9Do^>kobWrwPs`x0~ra^?3b9E8gGzTlwJ%<
zQQ*+cNz6;v4=yRn%uBasWDv(t4UuAG-~cHsO-xTkxW^|mIW@01m61UJs>?aQpt2}4
zJp+`&ph94WxTF>*7iAWJas|wGIb8BE`!t{m!V`<~GV{`dOA<>;i#_v7Qi}?TQXx4E
zW|k%qN@2#Lcrdg$F&!Qr5>QjXE{4d!G=ZbVJ+&k_F}ENm6_Q{X8AL!Df>TQ%d}sn@
zWDrQl5VF;PBq~r4!or%AEWraRV0=>(i%W}AQy3Yz^OK5Gi^{+m24~(1PfaYzNG<Y5
zD79u}V95g)mzqAw`MLUOiNz(UMHRU@`dNv|*~R&J`YDMeiAkAxDf(W;`FVc%DWF`#
zotalqS`u7Rl$w|eN^RgolbNsYRGOBST9lgNiIBEtWME8VWYEB2dUAeID%fPV#N?9v
zqDpH<2Bxe6Mh104>H`vsic>)uoH;QkhmnB?$@`!hAvdw0Ahn2*K^KQPa9{Z+Wu+#U
z_=1&#ii@<&qT&)z;Q&tEFeX!K1tWtfB*HTD^*#OJ*%nkVre)@&f^rcfgEd46ymZ1*
zP+*A%J8O1EYj#FKc19a^Mq6-AE6dJk%E-VKoL^d$oa&Yds==hNRzG^6@aJL3W5{P`
zwBup4XLMj^bmU=lVsvI?FekHGV`LE1FNY)-P*}w$<(FjWWfkY=@i44mSj)r6%jm+x
z=*sBE$iVGdT9jXqs_$Q%lh4lR&co=z=*h$A#pun*AOvz4q^yP&$vlicjJ_bkkB8Bp
zF@T-Xf`>7XF^HYfl7}&vF@%RPlrfBvK^oQ7(5eAayzwxGGY0T5MleS5Fh(&(^DxFR
z#<DZU@i4|SCh#yOf<%%SqZt`QQQV)HSp;@IBZDN0ILKe|h7hkYGAN<QrDY}NWM}53
zr^XkTr>3OlK@H#l<-Dl;JWwGA^?PthesXq3eoihAV=`k3BZCmA7;p&=ffm`I5M*SK
z)=$jIODrmgPbn^mFDXjQE6xO!eo#}n(vb>tH2<TN-;4}gF0MYFjzNwtp3XcBd5q3H
z3||;ic^K0e(-|3fV8%caBm)n_FUE8bk-^9SvI1H@^Dz8_sfHKOJd6w=F=3bqNF_86
zBNJmfh{#}MkV{W3!BYV9FtUP_vNC2cGVsET0vDY;j2s{t4v-9gI%>(u!^jP?Tc9`<
zz35cOniRkVGD;!K!<fl1mxnP6l<1|w=?;5=#KV})n8VJP%fpz*m=6lR0!9Wy0!1IF
zc*x942bF-(a*CbNhKI3`v51|~mWQ#Jv4oL9oq!o2&7k6wkwF;jI&c}`SX7i)32IR=
zGH4Ufk6cjkFqVR{N*QB04`T%=+-y+;36frjXpe!K7%GOKP^jc#tYWNYWZ*+M4pItY
z4}Z)OjEAv?v6hj6Hzz+GTqBny=6I&?FxD~FvokjEFg7wa@h~<swlFeCq~@gNrskDE
z>n;#8q_Q9tq_`Cnd8}oLIi;yQjBSkVJd7QToji<PjNOb38lZNM0=VK)NGr<ERREQ`
z3Yo<UdHE#@i3(o9{(cIHpx|U@?BQYT1(^g1Xw>qWk-?gRuwrBo0EZ8_(uTwcN{~UK
z5~<kpEJ-a&EXgl|#X49cyz)RX4%V<x!=4b(Yf452RRRhjRV1n%mBl5gxr_|V`K2Yu
z6<R=1W*)RYw}v@2GhZJ`n2~|K0Hi1<kC8zXThk?skwHfTd%GAjvs#1tX`Jb)C6FSW
zkwHj96RqmBMyWnRGILWQMJ{)GY6*g;fz2sMCc#u%GctfQdcwOfT2PJPYzS9{><Czm
zWzERIT%20M$iS)L2?ijyvub#Hf@pTAYtVfF$~&N@K_)!@#ZY_*OBbNNO-5p|Uus1O
zxceFfYL9_AA~5yfBm+rn){G2->8T}Qi8+}mAU6k>Bo=`jmYknkkXV!&lF!H>jO;J4
zD>OYB8N|XJgZw=G+~b2o9795b<Nf^OgFJ)185x8jVFk7Wlx@?&Z7NW66{Uy=#W^%=
z(3K+kD~`p*sUYX@fV$;HC9Z{~i8;lL4C+u9fi*(?fn+OG1QeK(Xs-12^z#pbI#dEp
z&coB)11cp1uQUP@ixP8FOF#`j6k8!#3)(nCb_d8-c@6YtH>CIkr&`YxP%M_@Lrh>~
zK#diMs5K*l8nPduqR8O|6=G!I@b!0b^@;a%fs7bH?O<f!0Cf;R;~AhBMAiu&3$SKn
z;761@U?D~ZP(2-#S`2O-Iu^qk<C?f#0xAem8s-vEwP+HcK;cO)N=+<Dg%u%oI8@?j
zUBk;Nh<=dsi&7I)!axPPV{u4PYAPsM;OcRJb%PXvs!LD?$t(uflZ*_^>7aawz2}6z
zFa)){(0eaziNzt{Eare-UO^(B$a)i8hVdll=ar=vfwE+2DkDQEG@Ovr7``wnsVqp<
z2i1N-si2NiUUI56a^yqv1|tK1F{IFg)|n}wR07FE;PMNS&%+oQSQA0rVQ@*}$;cpx
zNHfs9&B(wGu3i1p7#YMgJdy2!s<38c05!sVkZW;}T8M36f5B9O(us6&YKbe3`kax0
zBeB>ezZ5+7#;l>~!pOi;3@*JuLB*os0y2O(F(n05x*(Yk^|fXcBZC-ZoGcBLt;_R^
zvh`tQ3`<&KW)6cQLpDPW0|<yRFoOC&42%o~pn+ZnMg~R(1_oBG?F@_?85kIt7z!B}
z7`Pai7#J8#7+4rg8HyMf7<eFx7>XH67#J8h8A=)Q8JNHZNP^5{V1Q_51Z!pkE4E}P
zV_;wavCF|)DhO+_g=?t<naEHD*P;#PLv4XL5o9t0gCmmj7@^LC*;@_PR72PhS3HK)
zf(@x-$Y)>%`Iq?y13LpJ0|S%BCI%)U=4}ityBSy`w==N$XbG`zXW;PF*4f6uslAPX
z%TI`V2LsOz23{)`Nftr&d+Y-I%*@Q&82BYw1o)V@F$hSqY-13#VueZy!6ZR~Y`Qxc
zgcupD*d^I_G6*v=%w&iKu|yad4lsyXaY%CPWDsLykYwG)AU>BtcoTyJNJNs6VF!cM
zat3`62PDk~la>aFz@!B>F~}hC|IgPFl0|hmx{I(mS7ZR4D~H9oYy#pi7hyV=O+X4J
zN%znN<tY|$wm8OM$iTqh!@$Ad%OJqu#~{w&&mhAPz@W$w$e_&-#9+w~%;3ln!r;LW
z$`Hm7#t_R8!BEW*&CtaV%P@-}o?#_JBEwFGREA>==?o_sG8rx~WHDT2$Y!|3kjwCb
zA&=n$Lq5ZIh5|-bhC)UjhGIr7hB8J=h6+YchAPGgh8o5Uh6ct`h9<@ehE~RUhBn3)
zhIYnIhEB%m3|)-#8M+ylG4wEQVd!Pt&Ct(ylVK9$3x+9-KNzMlu`|qI5@(phq{1+d
zNu6O4IIpBJa4}Rfcr(;9G%#>5YQb4IVJuJ%fo4YmCJBZ{h9(9^25}}qhGvEq1||kY
zCU%BahBgLf25rW_4DAdZ3@i*Dj1L$(8M+u)8DbevGjua_F|aZ8K+7J8`d$WRhCT)c
zh7bn+{|u=N9PAAJ><kmw878tbOk!u4%+4?cjHWU${9!O*XP74Ui-G4C1JfS{FLs8h
zgoGHTGcYi)FfcOAfR{ou!FhicEblXYf#iM0iJ-hMkCOKlKxtA(NKr^>8-p@Z8K8t*
z2HeM22Ha;C7`QS3<RO)93@lngs@OdODia2;^AVYB8iOhW1H&=~4u<6n0t_n{#2HpH
z$TO^BP+?fjpvka?!I)t!gCoN_22Y0d3;_%q7~&W<GNdwWW@u*E#xRLt2g4$UT?`u;
z_Ane|IKXg@;Sj?`hNBEO8ICbLU^ve3g5d<iTZWSipBPRvGBBKB<X||<$j@+&QI_F6
zqYA@CMkj_VjDZZ-7!w(8FcvV}Vr*cz$Jop8fN=uDLvW^vVc=wFhGh^&Cm4%?fpH=%
zt1vdgvI=7rG^=PbW<axwF=HGws{}AQLbFOLqYheDfvAUN6-NfH{|vb#WR)oNtb#LN
z%!XI2?F`HeEDQ_`+Mr~lhLkUMGpI)jX>4cE^wr+Rpyj8tjX_&?8-w-^1}RXCLF#cS
z1~vu;h8GMR3@;f37+x_*F}!AwXL!S)#qbs!YFZGZVIjmI4GkeF20?~7409Qn7~~mv
z80s13GBBfM+<9;Z7BVn_O_2mSPzT9@Lb@QA>G>g?BgVkWz`*c@frH^Ig8;)f24RNp
z3=#}Kk(?q4cM2!eDZ&hF409OfGcYkoFfcOIGt9?u$^y7kK&2nZ2055hgmitNO$c8h
zT|XV|Z4CNWEC~02gNKoUfrF8eft!(uL70)5L5z`wL6(sX>?RYid*z^R;${$LSjaG+
zfssL&fg9{PCI&GE4zTN(8DycZV?hh3MR3=l1e5_rKpCP36eBMK2O}SY03$zxFrxs2
z1fvkxQII$zC!iK%cZv~)Q;ad3BFVtPD8(SaD9s?uD8nGZC`X}FmSA^^35HWlF`S~x
zz`>}-Ai${3Ak3)2Ai=0bp;MN^or02lKu*C-K4zH7$B==8(TIVY(U?J)(S$*a(Ud`!
z(H!h1Y9ya!aMz(EA9IX=vcL!^I|dF$dj<hU2L@qAM+ON-XRxElPd>}xPC*GMkW(-N
z$`Ui6ycjqby&1R}eHerpeHp|U{TO5!1Hf*gMnJ8AyACCwtS|z~8Y7^>88{dt7z7w2
z8H5?57$g{Dz>Xq6pjN`2f)Y?5r(gz@4Q4<kGjK4bFmN-bG6*xKF^DmyGsrS#g55-o
zfLaB29ZEpiVg!^OMnDxXa4;4!2rw2g2s0KlNHCUy9YuaXt%kM!7_u3d7?>Ft7-T^u
zw>`MA1nTj@OK(uo&50<u!4(N(4Fd;bEdxJe9fLSyJ%bEmBiK0#5QCtFHa`O&xUOep
z5NBY67TVYwqfDR~MM%$`X&(bC13v=;quOo;hsf;=j=nmZ7@W2-Xm4Y12DL-Ew=pR1
zW^jqr+Q#6jy^X<bJA=F5ZU&FY?F^ov4yo=o1}`gCP!H1k0E3Se+inKm$n6Y%R_wbO
z{3EwB1Xyt}T5&R3aY?dmV+fqdun9y5S#e8pL;IuiKrC>7)W?cPl0%Y5D0mw~$To)1
z-3(!oTH6`Iw=qN<V2HHhmE=6ez$?iq$-9j~d>#Y4B(D{xBo|1C3oJATEX1{&Au4h^
zL$np2Bp*mPMv_mGM<^C-V%!df_-zacV39<yNa!|(BrrD_%uU(GkSfV8$+wdsjfo+A
z`Tw}(3>-q~I~X!_gfb=Bw=pQ|Z182=02-5ERAN+S$YOwW$Eq0Q7#JAa7&sW)8H5<S
z7^E1x8MGLC7>pTv8LS!m7+e|q8T=S0FoZKsVu)g#%n-{sg&~!38bcG~bcT71GZ@w~
z&SKceIEUc?<2;5Vj0+jgGA?4c!nl~>8RHU$uZ&9>Ss0fw@-Z%F6k%M$D9N~vQIT;Y
zqcY<rMis`*;50CUfuCU>Ljl7&hAswPhO-Qg4C@&-Fz_)nG4wEOWZ1;O!@$8P4NezK
z3|b6788$O)VPIx3X86Fcm0=qL3xhSo3x@3sI~Z6QTp8{$>}1%)z{cRmaFt;fLmLA-
zLpZ}3hTRN%7&sWB7)~<mW$0qyWQb)r#;}i}i-C(#g@K7-Kf?jgAP=J&G!-&1sxce{
zHyvP|E{JJ|7}&v`E<Xm&{|q?{Jm5~(VQ{DG2s^`3c7|i@49CG8uoK|k*A#Y!sSFH%
x863dEQ<(Xfe=ztkvHWM?WMG2mWng4yILW}oa0)!!bebU-JmAF05C$1a0ssp#-#!2U
delta 4635
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
--
GitLab