From 0f6760d42765b5b91a6e542bbd3f36c3b57e2520 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Sat, 12 Sep 2020 13:54:21 +0200 Subject: [PATCH] (v1.3.0.9017) small fix --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/mo.R | 74 +++++++++++++++--------------- data-raw/antibiotics.dta | Bin 329492 -> 329492 bytes data-raw/antibiotics.sas | Bin 1880064 -> 1880064 bytes data-raw/antibiotics.sav | Bin 1406605 -> 1406605 bytes data-raw/antibiotics.xlsx | Bin 66083 -> 66083 bytes data-raw/antivirals.dta | Bin 68841 -> 68841 bytes data-raw/antivirals.sas | Bin 81920 -> 81920 bytes data-raw/antivirals.sav | Bin 69306 -> 69306 bytes data-raw/antivirals.xlsx | Bin 13909 -> 13909 bytes data-raw/intrinsic_resistant.dta | Bin 3909333 -> 3909333 bytes data-raw/intrinsic_resistant.sas | Bin 3985408 -> 3985408 bytes data-raw/intrinsic_resistant.sav | Bin 4353410 -> 4353410 bytes data-raw/intrinsic_resistant.xlsx | Bin 524510 -> 524510 bytes data-raw/microorganisms.dta | Bin 26468289 -> 26468289 bytes data-raw/microorganisms.old.dta | Bin 1896607 -> 1896607 bytes data-raw/microorganisms.old.sas | Bin 1941504 -> 1941504 bytes data-raw/microorganisms.old.sav | Bin 2034367 -> 2034367 bytes data-raw/microorganisms.old.xlsx | Bin 453024 -> 453024 bytes data-raw/microorganisms.sas | Bin 27521024 -> 27521024 bytes data-raw/microorganisms.sav | Bin 29548953 -> 29548953 bytes data-raw/microorganisms.xlsx | Bin 6401595 -> 6401595 bytes data-raw/rsi_translation.dta | Bin 3121505 -> 3121505 bytes data-raw/rsi_translation.sas | Bin 3334144 -> 3334144 bytes data-raw/rsi_translation.sav | Bin 3582161 -> 3582161 bytes data-raw/rsi_translation.xlsx | Bin 656226 -> 656226 bytes docs/404.html | 2 +- docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 8 ++-- docs/pkgdown.yml | 2 +- docs/reference/index.html | 2 +- docs/survey.html | 2 +- tests/testthat.R | 1 + 37 files changed, 52 insertions(+), 51 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e3418f58..7dd2cacb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.3.0.9016 +Version: 1.3.0.9017 Date: 2020-09-12 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index c18501a8..6c57494a 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.3.0.9016 +# AMR 1.3.0.9017 ## Last updated: 12 September 2020 Note: some changes in this version were suggested by anonymous reviewers from the journal we submitted our manuscipt to. We are those reviewers very grateful for going through our code so thoroughly! diff --git a/R/mo.R b/R/mo.R index b0700fda..75e2dceb 100755 --- a/R/mo.R +++ b/R/mo.R @@ -281,6 +281,43 @@ exec_as.mo <- function(x, reference_data_to_use = MO_lookup) { check_dataset_integrity() + + lookup <- function(needle, column = property, haystack = reference_data_to_use, n = 1, debug_mode = debug, input = "") { + # `column` can be NULL for all columns, or a selection + # returns a character (vector) - if `column` > length 1 then with columns as names + if (isTRUE(debug_mode)) { + cat(font_silver("looking up: ", substitute(needle), "\n", collapse = "")) + } + if (length(column) == 1) { + res_df <- haystack[which(eval(substitute(needle), envir = haystack, enclos = parent.frame())), , drop = FALSE] + res <- as.character(res_df[, column, drop = TRUE]) + if (length(res) == 0) { + NA_character_ + } else { + if (length(res) > n) { + # save the other possible results as well + uncertainties <<- rbind(uncertainties, + format_uncertainty_as_df(uncertainty_level = 1, + input = x_backup[i], + result_mo = res_df[1, "mo", drop = TRUE], + candidates = as.character(res_df[, "fullname", drop = TRUE]))) + } + res[seq_len(min(n, length(res)))] + } + } else { + if (is.null(column)) { + column <- names(haystack) + } + res <- haystack[which(eval(substitute(needle), envir = haystack, enclos = parent.frame())), , drop = FALSE] + res <- res[seq_len(min(n, nrow(res))), column, drop = TRUE] + if (NROW(res) == 0) { + res <- rep(NA_character_, length(column)) + } + res <- as.character(res) + names(res) <- column + res + } + } # start off with replaced language-specific non-ASCII characters with ASCII characters x <- parse_and_convert(x) @@ -383,43 +420,6 @@ exec_as.mo <- function(x, } else if (!all(x %in% microorganisms[, property])) { - lookup <- function(needle, column = property, haystack = reference_data_to_use, n = 1, debug_mode = debug, input = "") { - # `column` can be NULL for all columns, or a selection - # returns a character (vector) - if `column` > length 1 then with columns as names - if (isTRUE(debug_mode)) { - cat(font_silver("looking up: ", substitute(needle), "\n", collapse = "")) - } - if (length(column) == 1) { - res_df <- haystack[which(eval(substitute(needle), envir = haystack, enclos = parent.frame())), , drop = FALSE] - res <- as.character(res_df[, column, drop = TRUE]) - if (length(res) == 0) { - NA_character_ - } else { - if (length(res) > n) { - # save the other possible results as well - uncertainties <<- rbind(uncertainties, - format_uncertainty_as_df(uncertainty_level = 1, - input = x_backup[i], - result_mo = res_df[1, "mo", drop = TRUE], - candidates = as.character(res_df[, "fullname", drop = TRUE]))) - } - res[seq_len(min(n, length(res)))] - } - } else { - if (is.null(column)) { - column <- names(haystack) - } - res <- haystack[which(eval(substitute(needle), envir = haystack, enclos = parent.frame())), , drop = FALSE] - res <- res[seq_len(min(n, nrow(res))), column, drop = TRUE] - if (NROW(res) == 0) { - res <- rep(NA_character_, length(column)) - } - res <- as.character(res) - names(res) <- column - res - } - } - strip_whitespace <- function(x, dyslexia_mode) { # all whitespaces (tab, new lines, etc.) should be one space # and spaces before and after should be omitted diff --git a/data-raw/antibiotics.dta b/data-raw/antibiotics.dta index 776d4ea9c61e946069305b0ed93e841f95f9c602..c5e259bacc42da7dd535a76281fcbb819fcd9e50 100644 GIT binary patch delta 33 ocmbQzCo-i^WI_w8p|O>zabss|Cu3_TQ)?%4YbVRrPS$QV0LzgJtN;K2 delta 33 ocmbQzCo-i^WI_w8frXWcMPp}cCu3_TQ)?%4YbVRrPS$QV0L(iJv;Y7A diff --git a/data-raw/antibiotics.sas b/data-raw/antibiotics.sas index c1900173d7124c0d2dafd47e5d273c0714004c5f..0c24fa7f071d97ab118c8f5b836a698c06675541 100644 GIT binary patch delta 108 zcmWN?&mDna0D$37NJL1;pB>E51ntrUIlQMXrf~Ip54P#hDD_;Pc4*q6`Fzt*yt=*$ vVfro3Fv2-5aEURlFu^r$FvTtIFvC3_@Q68{u)s53@QNkg@Q#na&-yn4Tz4$; delta 108 zcmWN?I~9Te06p@g vLGb@6PH>7d3~`PTE^vu4CYa(1*SNt9x46SS9x%rvp74wpEbxlu*Q)u9lXESG diff --git a/data-raw/antibiotics.sav b/data-raw/antibiotics.sav index 3c580d16c5ea85b9122f0e6503a826350175c03a..529bd5e1bb1df0628036c230ff5d3c81a382a7f8 100644 GIT binary patch delta 89 zcmV~$!4bhg06@_RA&Zb83Q&UCkwaWGu_dGg1vva;X53WqkNQai+k^L}oTi*UW4OiP r9*5X}uaDyS77JY95=&g+8Y>LA!7c8v#yuXe!4{8r!ZUV1FZ1gUCN3l` delta 89 zcmV~$yA6U+06@`zAD)VWzX8}l5)xmqVF^ZH1P7qFC5fF=+|qqmfE_$%TKZ|}KSOxL swux>1{8q1|8^r`uT;UowxWx%<+gPEU?5gUhs;ypZEFw2PjP>Gynhq diff --git a/data-raw/antibiotics.xlsx b/data-raw/antibiotics.xlsx index 529a4caf5141f71eb9c1abfc07e021774e0a9c80..5ea53f199d721cb1aee61ac707b97b02bfcd3710 100644 GIT binary patch delta 491 zcmZ47!m_x9g(tw9nMH(wgM))%Q{F}%6-K5_d7F(GSAyutcbQ&-s1wWv^-GQ}T=>=@ z)t`?=y(?dF=j*1k@{=;I=jY$bEZyKPpMP%W{^}Deue;w(pZ}nF(=x{`3L4DHYeJS~ zU-+CiIexK@OP0(H0#?pNtENZpRJy9x=>nS30StS^e6y zKl6)hSnonpyc4rT5<+MCJdt;nIAbv{TAW13*S1V z`tz}9cjYVYeBE?bep1Hu{QO&)r5ldh-kVcg|9wL6TK-l3`wmoQmh^t=S-@gq?(}M% zoBmrh-M~l8mz%!2IrqAK$haGF$D*R>SQEEUjgaE4>lyM*OC_rJu^+7wOO>5Ex3H_# zVi#ZZG5ZMi9STpRv^jh>9Qfek{kFcz*uCtdD1L{g>ad)b?|t zH1`cpf%4=l=lA?|v3}R+k;EY7CjI+oXk7Sr{Px# diff --git a/data-raw/antivirals.sas b/data-raw/antivirals.sas index faa7fe333470a02fb062b7c27069ea8de67b4b29..58c852da75148fcbf99a44ca50ee833dbe3df4d2 100644 GIT binary patch delta 27 hcmZo@U~On%ov@6XK}5g%jw1sDkZ#<#bt9v{Jpg%Q2%!J~ delta 27 hcmZo@U~On%ov@7C!9ceAjw1sDkZ#<#bt9v{Jph4=2{ix! diff --git a/data-raw/antivirals.sav b/data-raw/antivirals.sav index 24ba37abe646bc35f162cb000bc6a0bce194b612..e8ae0140ec828070db54e14ca3196c89c5803f6c 100644 GIT binary patch delta 28 kcmdlrmu1&nmI(cCBsw`r*Y|W_i&T9Y>#x3yN;X4fq~0%xYIUsis-|+O$9O zi)>lUp3i&*o+r4nJ7PYa_~>%_Zhe!px}5O4`xAq7Jib5tEvdlTCTB83!a!H!-&eN} zRxvR%rXH>2$tvVM9Kdt+jd!O;-CaAIvk!|?m-UM@+=}8-v-yxw8~u2HbHSSDih03| z)vTY&e15fVf1k13c0wfAfk!Wb?Cno^mzM9pydBM7ey3&E-UvOq>gw&1PdW8U zRz+bMzgYvk**Uxeb}koWWMGhBVqicHyv-7<+ThT0W$Oad7uhBGL819Z>=l@QLt+9e zh@U0r59aTd*8|h96|96n!K`j<4x$o_?LpK+V;hc5c{+h0>n1;iNXePFfuzz*f-v0Knl5f73ZLJFXm5`?3cMYtMXL0?P-?7y8bD}i& z4Nrmc!dY^JQ59$tBu_hfi_uJ@XCe~-Vq|2L)O z%Id9V_XE7yIf`2!z7%9+V31&9U_cJM%@VBI;Lvkr>jKjk*(Lcwq4`Ga6_|fRVgf6O zpC#uH=I@r*1Jkb+tb{fL}ezGmt6f?ZTyHSN5P=-g^pa$5Pz5d@q*T?fIx(p8M z;3$Uh3Bwq{D8?|32~1)N)A)=T%wi7nSimBdu#6R~VhvyL73|zi5 nIKUx}@B=?_j1!#V4ClDOFI?g`2DrjCZg7h`+~eWm&+p$I5(G|? delta 197 zcmWN=$58?S06@_pEI}j*N>s80l`JgS0!=x?Kl~e2(1B%mqz!6-H}fw4*U07mbPVR< zejWab5sYFC;}~E9lbFIZK41nPF^f6OV*!i!ge5HFGrnL2t60N2Hn54W_=YWPV+Xs~ p!#)o19fvr=F;4IUKk*BvIKw$EaEU8i<2P<_iy`iC|L4!)d;=H0PMQD! diff --git a/data-raw/intrinsic_resistant.sas b/data-raw/intrinsic_resistant.sas index 158bd444dbe6ff67c9f20989d26d91bc96b1f1ec..c0324c7a925e8d27c321555e7b288db4de15b233 100644 GIT binary patch delta 206 zcmWN?xm5xI06@V75y4eN4pBr@yikq>50E3F0$W;wACXW3k@*j-g9hw^2H0TU#G73z zPON{!pc1YA7eSD`6jPYS1I*wdX7LDfn8#xb@dQt?fM;05b1Y#QD_F$~tl=eIVI8lr zfj8L1TfD=2Y~cew;uAjO3%2nU->`#S>|q}x9N-Y&@dH2c3r9G{Z=B#1XMfIrwtL-- BS>^x$ delta 206 zcmWN?OIkqz0Dw_K;d&$`(TzeSd8CI|gIYmbx(5Hq#1f2}|AW@i2HHg%a0ll*(e6JP z#kSwU$0XeReI^p|YcYujn8Gw>@DPtMi#g0=fCVgK3Cnnl6+FQzp5htS@Eq%Sfemcp zC5Cu~Eo|d8-e3p2*uz`A!+Y%G0}k*Jhd9D9PVfn*_>3?3if=f>IWBOCs~_LLe)mil BT6zEg diff --git a/data-raw/intrinsic_resistant.sav b/data-raw/intrinsic_resistant.sav index 1e3109fb6f51baa61e152fa0292d92a272e1428b..ecb9af18c7eaf9916ddae3ec24b00b4d5c749eaf 100644 GIT binary patch delta 227 zcmWN=%`!q^0D$3ficWq?B1shaCmf#>9Yx%WolSQ@Gw;Gq7xFG$id8q0XXcsAzN5+i zpZ7QkSsJp?n~n$5&-|CTfDz^}kBhj31&pzX%eaE8xP~Px<2qJw1FN`+TUf(wtm6(g za2K1nhx^#VHXh(1cJK&~@dQut4A1cbFYyYyc#SuBiwWLgzA;h@gUF>YUfim+8J9Cgf7$#TCq876V+xHOyg%c`V>MZr~ z@DOWQ$0Iz(6FkK;Y~VRw;3YP(g>CHM6<*^F-r^m0v4?#e;5`oU0Y^B-2qzfhBPRHS O&-j9`IQ{c&{;>ocEn@co diff --git a/data-raw/intrinsic_resistant.xlsx b/data-raw/intrinsic_resistant.xlsx index 910424fc58cae3432cc252b1267b0c7aa4de16ee..3c6ed5189991fb10ce1aea9ad878bfa421e8d2ad 100644 GIT binary patch delta 524 zcmccDsBo`QfhWM5nMH(wgM))%Q{F}%6-K5_d7F(GSAyutcbQ&-s1wWv^-GQ}T=>=@ z)t`?=y(?dF=j*1k@{=;I=jY$bEZyKPpMP%W{^}Deue;w(pZ}nF(=x{`3L4DHYeJS~ zU-+CiIexK@OP0(H0#?pNtENZpRJy9x=>nS30StS^e6y zKl6)hSnon-FrWL` z1Xd7#?rVQA|J@rs5Zx^Iu3hdOBM>tIF*6Xe05K~Nvu&4q$3B4{sAl?xzwG89`sH7C zdl0SlkKKl2Q=U#B$TidR{y}7y|6_Lp$-e)`9t@&g{T^bK4QMy^wrI|*X={b-Hk|A@%Fcmm3;HPY-?56uY@!OziVK9Jd5kU{Enrz zpA)6IZ+HrnCto?g=dX+PyGD;B1}Qh`-#=XEbW=`Mmm)#tw zcKXY|?DinO)<1R|4h}b+K#*&u=lui90!5eqV|N45@Bgs}gH*fxXLkV6ZU5OVLE;Dh W19fw{O=aS+22u7L{vc`shaUi&WXtgY diff --git a/data-raw/microorganisms.dta b/data-raw/microorganisms.dta index 68f139dcc1fb0ca7f4cd74a6f52148bfe58c54d6..eaa32821da2bf6d347e40048dcfb74959f22225f 100644 GIT binary patch delta 1376 zcmWN=1+WkV00qJMbf;2^bW4MDgLJAOE!`qWiy(2p5dwC1cQ+z-W4B^=ckA1k-M4pt znSHryW6{=aJGXDUPAtGeSQv|7Q7neVu>_XHQdkpkH8Mt z5j$aL?1Ejf8+OMY*b{qUZ|sA8u^%3Z{c!*e#6dV1hu}~ghQo0Lj>J)T6dsMo;Ak9! z$KqHVhvRVqPQ*z#8IQv$I2EVibew@RaTdxDmlkxEZ&gxD~hIcHDud;!fO!yYVzU9nZis@hm(W z&%tx?JUkySzzgvrycjRROYt(i9IwDD@hZF;ufc2aI=milz#H)7xt1Nc6EfFI&V_%VKhpWmvsoUV&9g<&oJx2jsvUl!J3f4$WaX zJV)fn9F<4q(Roac&M|pxj?Hm7J}2bFoRpLExSWzxb6QT%896g&b4!|Ab6alD9eHZ* R%w4%VPb=8t=>;7R{10CzVSNAq delta 1376 zcmWN=2eb$T0EW@?WUqv5Wh5e-JTrSlHf1Z6y;t`7@Rb$qz4zWr(%#y;wD;b-{(H{d zyJuh7y}4sUu@;3L+7zx83$O?tfJLzw7RM4;5=&ueEQ4jS9G1reu>u~16|oXl#)Gj6 zR>f*q9cy4stcA7l5Ihv?U|p<-_3=o+5Ah@X7(c;J@iY7!zrZi?EBqS2!Ef<9 z{2qV6AMq#r8GpfF@i+V(|G+=-FZ>(-!GG~TE!b*77Rdv$Xco)jSt3hjsVtpkvTT;i z@_ArZ$b+(CR?5nGa8}8xSuLw)jjWlqvUVPlhi09uoAt7O9+nOA@NAfk@`!AlP4dWW zn$5C#w#b&*DqClpY@0`AyDZH1*&#b-r|g_v^62cE-LiZ3$e!6NduN~QoBi^b?4JYj z*c_OHa&QjGp*bvv=ZGAc$K~-kDo5v-9Gl~Ed``%Tc|x9;lX7xS$&>QroSM^edd|q1 zIV)%9oSd8Ua(*tzg}Epf=aO8Sr{uC+o-1-?uFBQ9CfDY=T%Q|~+?bnkbDF2-X}Kl0 U=C<6PJM#40S+Lt(1%>wX p;Tls6xWO%EnBxu$+~WaDJYt14p74wfw%FkXuXw{dK7KyC{{jd=Cu9Hs delta 102 zcmV~$yAgsw06@V}I0aDz1^gC4V8GDURp5*-c$pngg$2<8CAd4yahl`z6Z&C%4R3LU pYfLc3fE(OmhB@xAz&#$Y#3NQ%;|b5$V2d4I@QOFQzzNufjNvDW8`$VS*crrO@RipNO*=I2KB*pM_j?Ax v|CczyDTX-1IYzj^CC0eI1XEn&2DiAwJs$9g8RmGxGZuKkE8g(_wX8oQ25K&m diff --git a/data-raw/microorganisms.old.sav b/data-raw/microorganisms.old.sav index 03f45adab61cc2fbc8a013b009f0f76b5136b53a..1b4180c68c6925296010c08ba318ee5cd67ac7f1 100644 GIT binary patch delta 120 zcmV~$D-wbL06@V}5f%T4_}2?i9LBbI( DxO6dW delta 120 zcmV~$DH4JJ06@{f1qF9d-1PzkgMlG?6>dS$@H+;^Q~YRVyqWKHZQZqXQ-!ypycgx? z_Xx80Gk=Kz_OOow9Abzg9AktrPH>7doZ|wQxWWWeT;m2a+~N-Rc)%l`@QjzQ*ChS} DtT8c6 diff --git a/data-raw/microorganisms.old.xlsx b/data-raw/microorganisms.old.xlsx index 4f7bc5dc04d73ec7cf9ec457b8a2d8ee6572107d..0e0f4ddc8b930c5b664c4114e705ad73922b3829 100644 GIT binary patch delta 528 zcmZ2*S$e@`X`TRYW)=|!4h{~6O?ex6R2Z2yRi^yzYKCeg1>yP0Jj&C}=P%uL)U} zec^N7(43Wifj`^A&iW;L7fZ`E=r=%jvuIP0s3a!td@+4ASxV{_wY?0&AO`$qWetU5$TV z-9A{w#LSp_w2~*QkoRx^&($~Hof>s_?QG6IEKXh4FVb);ic8JrLq=`%G&i(+LDQXS%_2h-~I_HaC#$#^-FoAe!w3n*)gUc)?}~qMKhp VbRT)aW)0#qzGU+U(LpcS`~Vv!+cN+F delta 528 zcmZ2*S$e@`X`TRYW)=|!4h{|m4!4awDvV4VZkvr5SAyutcbQ&-s1wWv^;?A3E_~~d z>d(ib-IcGn^L5i%`AHeq^Yd?ImTow1dv8v0{r3sMYx!6C?>kVLS(ey9gB*hV@=#bHA0HFu4l+MEtRO=$9}X%ELC>u+`_I_ zi(P!t$Lu56cPKoO(&q5laNvWB_uKj=XLq@$-yV4!6kqbUNM-qdSoAmFWp>g5g`QNgcvTAyGA#@Mh;IZhiPtkdc8wf{B3vIq)`1uxf)t&y}qUL^oe#Z@>~6~t&e*TvlP$12Ni})tG^p1&CRB2JsnRviXDPpqFfZ05$={djJ3c diff --git a/data-raw/microorganisms.sas b/data-raw/microorganisms.sas index 991e1fa53f3d547e4ed53b9a33174c568ed1c232..54d05698c6d36eab193c2e7d673c9a8e217d8df2 100644 GIT binary patch delta 1446 zcmWN?XSfIi0ESUFdsd3>UVk+DUz3n1-Ks;#bQ_-OJGSXg{83!mc?>d9xLGfcmN)V z74aZE7%O3AJOry?Rjh{9u?E(}T38$FU|l>E>tTItfDN$`HpV8{6r15;*c@A6OKgR$ z@o;Q|ZSe?fhwZTgcEnED8IQy+*cH2BckF>Z@hI$tM`Le12K!)N?1%kv03M42aS#s1 zA$S}fk0;UuCPRBEF z2A+vCaTd88#>?>v+=Ex*Rd_XCgV*A9cs<^L zH{wkw-i){4t#}*Wj(6alco*J{_u##_7w^OS@d11gAHs+65quOM!^iOnd=j6+r|}tl z7N5iC@dbPlU&5F16?_$6!`JZ*d=uZoxA7f(7vID8aUXtwAL2*&F@A!d;%E3det}=& zSNJu4gWuwJ_&xrBKjKgLGya0V;&1pn{(*nuU-&ovga6`xt1MV!LF^YrqgWJ=5>YZr zMd>ILWush_j|#DW91sUa#W*Mqj!IEE4v8vJHL6ARs1Y@zR@9C;b1GFnCJI6T@!+c+ZHMf>Ow9ivlpjw7Q>bd7G&J$gjXI4XL@(a}4O zi9XRc`bGa35XZ*A7!-qJNE{c(#|beshQ*0-Qk)#aV?>-1r^d(_6{BNJjE&P`T#S#? zV?s=fNijL5#MGD;)8mYo5ogBCm=&{QPRxz7VqVOT1#xyPjB{d9ERMoh66eO!SQfAZ8DVO$g!$L6>sE{!d*H7<*7u|0Og&e&D3*WCq! GzWX27Q@{EE delta 1446 zcmWN?XSfIi0EW@75!qyA6AERINZETvA=yMCL}8;td0j^4XlZ^ur}7gx>yhEV*@-G8)74DjECT%*aVwmGdv6r$L81qTVgA0 zjcu?kw!`+=0gu3r*a?rs&Uh3aja{%ScEj%21AAgG?2Ub}FZRR!H~<8VAqz==2sC*u@65vSrbJPD`c$v6XN;wd-_XX6|^ z73bnSJPqgL0$hlv;~97+o`q-QIe0EE!a`h(OK>SJLvT5shv(x8T#2i2HLk(6xDMCj z2Hc1j;3m8fFT%~Z1uw=+@KU@Cx8gS3jyrHC?!wFQ3cM0`<5hSyUW3=-b$C7AfH&ez zcr%K(;H`KY-i~+Rop=}CjrZWacpvV;`|$zXix1*M_%J?#kK$waI6i?-;#2rEK7-HV zbND>IfG^@p_%gnNui|U?I=+E#;#>GOzJu@Ld-y)?!w>L7{0KkBPw-Rx3_r&&@Jsv( zzs7IyTl@~c#~<)V{0V=?U+`D_4S&Z!@K5{;|HgmtU;J-{1#2vbB2hGoMe*1_N<_&x zAWB8)C=+F)T$GOrQ86mTfl)cCMAfJk)#IS35jCS$)Q&n)H|j*(L7p2%V-s?qfNApcF{gM#1YXkI>nLEIgW~>qf2y+ZqYq@M9=6Iy`xX` zjegNT2E@P^6oX?(42@%ASPYM2WX_ diff --git a/data-raw/microorganisms.sav b/data-raw/microorganisms.sav index 90b895ba51ad0ed8aa3ae46e226f0d9450c48fe5..0e4463a98a9acc26fd1e03b7043939eb5e1bd769 100644 GIT binary patch delta 1573 zcmWN=2ec3Z0EW@?l2TGC87gzVepnp$#}Zf)55Q7b8V|%W zco3Gwa(FP7#|l^x55Y=!C?1A~;}KXHt6){EhSl*%JPK>z(O45}VQs8~b+I1S#|GFC z8)0KS2AklqScpxr86Jnt@pwD|TVP8p!V|F-w#GKt7Ei*Hu^qO@Q}9$g4Le{*?1ZP| z8Q2-SU{~yh-SJH9fjzMo_QpQg7tg|e*dGVr*?10~ivw{G4#xBFd>n#9aTs2J7vgZd z2rtG<@KU@CFUKqJN*sYB@hZF;ufb7xEsn-9I2Om@c$|RO;Y6H-lW_`8MeusO0dK@< zcoR;?n{fut#925S=ipqNhx73kycHMVLR^H4aS1NPWq2Fjj>~ZcuEbS%2d>6D@h-d@ z*Wg-QhwD+?fE)21ych4oO}H7i;8xs*_u~V&9e3b^xDy}3hw%~Ig}ZSNK8law-Yw~iErWC_zu2{@8SFS0q(^Q@gw{gKfzD& zGyELCz%TJD{2KS+H~1}nhu`B5_#^&=KjSa>EB=PR;~)4Z{)K7G$y9 zFN^2?St3j30a+?b=Yd%!56ZGxE)UM~Ss^RtAz3L8&BOBWJR&P+m8_c8vU(nwM`evX zI%{UFtethTZr02C*&rKcqimeVWRpBL3$tl9%j2?n9-k*JI~2;b6^h2 z!FgVupF?tJ4$BMj!W^C#<;8hPUYeKX<#|P3nIm#!UX@qpH90D;&Cxj~$L6>kpA+)B zoS2hxa!$#qNnW2f>Dx8{Oen2U08F3F|2EN{!( zb9t`FmANYK$klmg-j#Rfnp~Ufa($W`a%0|;_vU@MDL3bq+?w0+{(K;}=Z<_ZcjiO+ Qa6Xc|3U<1?VBg;V0i*=>dH?_b delta 1573 zcmWN=2h<1z07lXC6GBF`>}0k?BwHvlE0v^SWi;$vgz`vs_H2vl$!?L=-g^)2rM-9G zJ?AdpH>>pWoIjvw{U*&CHEFhV&l^qaE|^krs#t)9urMBkMX)Fq!-KInmcWvD2$sUq zSO&}Dp;!*f<6(F>9)U;VQCI;hVkNAMRj?{n!=te}9)mToCf35*SO@Fkv3MLFk0;=X zSPxIa`q%(Z#)jAkPr=4`DmKBU*bJLv3v7w4ur;2BZLlr2!_)B$Y>yrAOzeoAurqeS zuGkIF!n5%l?2hN+d3ZkdzzeV^UWmQ$BD@$c!Ar3>_QAf`5BuX~H~)Jra4e3)@i+mm#%pjQPQq((GETv%cpYAk(-54FGw=qSi8tab zoQ-pEF3!XGxBzd$g}4Y8;}Tqo%Wyfaz?HZPSK}JI8E?T`@ix32@4!28E#8Iea6R6Q z_u#!KZovC+BW}XYxCOW3Hr$T);{*60K7o&^C-EtK z8lS;u@i}}RU%(gfC43oQ!B_D$d>!AwH}Nfe8{ffq@jZMWKfwL?A%27(<0tqjeukgp z7x*Q9gzh&(cn$_iOAD`n-Zl2x->9-YaC zvsTv5I$1Z5&ExX;JRwiadU;aT&jxvNHq1tON;b|@vq?71X4yPjWXo)ot@E^OlWntI zo}Oo9`|OZsX20(LugEL&svMF-b65_~5jiqP<>(xfV{=@N&k1>TUXv4ZQeK;rb4pIl z>+<@XmgMxDkvHVbyfJ6x?3|Nxb6(ER1$k30%tg64m*mo1mdkTRuFO@rI@jdQc}w1! zx8?15N8Xuh^R8T%>+|lsC+|&jL*ADgb5m~4Ex9$f<@UTkAIJyup?o-Ze;w4kMOe!;JbRjUv{^wgCe*E9_ocF+Uo-;6il|2BC8Wr2l zgTdqR7)D*Uqmaq!*7Zg*JDDt_u5p32L}Hj7QI%pDuW0WHn>svO( ztn|grS_LOx^$(sM?#$&b94&rV-P4iO=PO|c7_vJ`$44t#-?mGWb;57-Mf)4ByG{Ot|&Zbb1q98j-GbyUu>|}+#cXm z>1*ZUd2@qSn)-X`kC!j!svxSFA08_C`$K7qYbk2JWj@0@e#+^Y#&PPaszy@zMy?op zfBHyAoyUc_dj9g_~fV4GG(0aI`!%uQ(MVUe0`q7lMkP@34k^9CPrhqE-I7t=6x_W3G~|QE_=UW3M;5F&PX#i^2GRcD;N~2pL*$ ziv2Y*#A*vyZ{ae51#GYb4%h?PI93mhRwnG#|!w!gnoe&FgAOktXg8~vD5t3jR?1p4W0VV8#R7iup zpaM1QgLKFM4P=5AvLG9BU_a!-0my@VD1bsJf`d?OnwU8hJBfKTIdxGnxO|hci%KAC zeHSI?8FkW3^6E{aWEWLC1EnOXHc(mQ?|TL+k)+i?#ge*!#%ZjJX-Y=2g{Cq{uFzEa EKZB>Ep8x;= delta 888 zcmYk(dq~q!6bJA<{Y{9OctfN;$nRzVT2vqD7bE3NUhL&b7UflqR_S){K{G9Fp8BReFFoy2DIGJ_ z66L-EXz@tF0qc(I6C&s{mC`+3&BRN1X+EA<$j{Zgb>kB!eQK5}(- zMMy?R^YX{9T3=0dI9HA&*WOo)#0pve4_1Me;!QqDqx_f*Mi7g^_e!2>*j4_@F6KHv*};12>2!YT-WKnQ}>5DX!(21KwH zLLm&qunxi@qT5MHo}xATq(d@CdbJO|khF10rEp53|5xdJDUp+fX<}Lek+2@55Czd7 zgBaKVa@Yu)AQs|aGi-r)NPt900tF;P3MfGZTR{z}unp269Wo#jNFP~{4LOhtTF^lr z;!UvD2LyQp%kw1z~Tl`bZy%~m><#P?QOLF#L5xQ)ErMyHVchK<&fxL~96{{j%v Bj6VPX diff --git a/data-raw/rsi_translation.dta b/data-raw/rsi_translation.dta index 2b01fec7d6740d503777f5367bd882f8fcf17bc7..108d707f9d20d4d06a6dd58d0c6e20dfeb1889bb 100644 GIT binary patch delta 161 zcmWN=w+R9P06CAKoKBkN^Mx delta 161 zcmWN=wG9FR06@_k?(Xhx1qER{5`OVJMqmkA3Z|gFP2eRj{Jewk|8b9>F4yzrCI%S6 zD8?|32~1)N)0n|5<}i;1EMf`ESivgRu#OFEVhh{Y!7lc&j{_Xy2*)_VDb8??3tZv~ Q*SNtg?r@KXm&fn(2jaaym;e9( diff --git a/data-raw/rsi_translation.sas b/data-raw/rsi_translation.sas index 56f71cc99b3674ddd77223d80269627cb5b63937..27d39ccfea7a139b25b199ae3edc9e3658132fa6 100644 GIT binary patch delta 176 zcmWN?xlsZE06;1p*##|18Ng=^g47I*lGd;G%hKYxB7Pj4+u8vp?~Q2dI9Q_%my-kvKk!&OZ2=B0nvFwLAV zQJTc3+dc@gk79^9%wqwISi%P^V+9{E!YbDA37@f!4Qyfy+t|Sue8n#Iu#W>AVvHjk i;{@MuitjkX5B$VAF7OM#afvHjV}cv}!R@cR!~Gx3QB1D@ diff --git a/data-raw/rsi_translation.sav b/data-raw/rsi_translation.sav index f7808452dbe5f0064f46f3b3fd0c0d1173240cee..28d207ea45490d32cb05f1aa8a2d3001577da575 100644 GIT binary patch delta 190 zcmWN=IZgrr06@{O2?8pzgUUK0I}8IPQh6D!L1OWHI<8>zOAazEr;(SuIKCy~`|~ju zMu%N=*nD5YQ|0GZOkfgIn8pk~U>0-uhia delta 190 zcmWN=Npb-J06@_)#Ta4=5`t(`Cf!I%S-FgBsIvHbJ6Evz%N(S)PQ$BuaePh0_osa> z+-%pIZ4{oPLw$D?6PUylrZIyLn8h6Cv4BM^;Uku@f=^h*8rHFaO?<`{wy}dR_=;WZ q;T!gGfJ1!85e7KM2~Kf_bNs+h{K9Yi!3BmG;SyK4#@~Pcg3ArQF;Tq$ diff --git a/data-raw/rsi_translation.xlsx b/data-raw/rsi_translation.xlsx index 5f1a0549049690a430fdbc43f21b73ab4906244e..678dc5266f244e91f35473178f372ad8d9af64d2 100644 GIT binary patch delta 530 zcmaFVrtzpvgD1e7nMH(wgM))%UEW3>6-K6Yd7F(GSAyutcbQ&-s1wYF^{#~r-#VoF z^RcLRxdQpWZC{9Bo&8{Fmd&+Xh_ePZQx_q*xyA2e@T=D0;cgIRe^$g=DU zpYtZ)U!dcXr}BPnBU`V)gQ1|SUvm0i1W^O zmN9+fdh&M07w-J~7yYUgHj6YIy|}clZp!pm@9MTY=6ZTfnjGqPT6XP?(4(iW-Y)r+ zQ*WhM6qfOuHNcylgCle4Awfn41_>qx2IR2YEWxS`4m?-3E--zOy@m%AnEoQKz3L_J%+h!xil^}ZZU8a{H>IAc4z3|M1Zyi$o z`B=2O@)dW!ZaOPJDdT#6{;kZ?4es*!=XUO|KC#lw{cigF2hE$7xouIXNH)_|0?AQ zSv|corykj`ZQaq9sL^)yjd!O;-CbLovk!|?m-UM@%<|$=v-yxw8~kv8bHSSDitmCL zt64vl`TT0#{yt;5?Sx3K1CL$=+1sBw{p#JmyNi~osGdCO>vwwEnwwW=1%5J{Yjb;k zpW+ Q5dSa}mp_OWVdnA!0I%Y|0RR91 diff --git a/docs/404.html b/docs/404.html index 1287c7c6..942ccef7 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index e167677e..cde6600d 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017 diff --git a/docs/articles/index.html b/docs/articles/index.html index 8ded3898..445d9b12 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017 diff --git a/docs/authors.html b/docs/authors.html index e5db534d..2708d2b1 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017 diff --git a/docs/index.html b/docs/index.html index 85eef5eb..e31429fd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017 diff --git a/docs/news/index.html b/docs/news/index.html index f1acb44a..52768e23 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017 @@ -236,9 +236,9 @@ Source: NEWS.md -
-

-AMR 1.3.0.9016 Unreleased +
+

+AMR 1.3.0.9017 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 0de1f7b5..89777774 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,7 +2,7 @@ pandoc: 2.7.3 pkgdown: 1.5.1.9000 pkgdown_sha: eae56f08694abebf93cdfc0dd8e9ede06d8c815f articles: [] -last_built: 2020-09-12T06:48Z +last_built: 2020-09-12T11:54Z urls: reference: https://msberends.github.io/AMR/reference article: https://msberends.github.io/AMR/articles diff --git a/docs/reference/index.html b/docs/reference/index.html index a975d9d8..853de104 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017

diff --git a/docs/survey.html b/docs/survey.html index 2606a95f..6114c652 100644 --- a/docs/survey.html +++ b/docs/survey.html @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9016 + 1.3.0.9017
diff --git a/tests/testthat.R b/tests/testthat.R index a1bf3735..671ba9e7 100755 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -23,3 +23,4 @@ library(testthat) library(AMR) test_check("AMR") +unlink("tests/testthat/Rplots.pdf")