From ea27937439c9db88421772c45bada8f2befddeb9 Mon Sep 17 00:00:00 2001 From: Philip Delff Date: Sat, 17 Aug 2024 20:06:49 -0400 Subject: [PATCH 1/2] including ext --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index e70f568e..94c4ab54 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,6 @@ vignettes/*\.R inst/examples/nonmem/modelfit_dir* inst/examples/nonmem/trashed_* inst/examples/nonmem/backup_* -inst/examples/nonmem/*\.ext inst/examples/nonmem/*\.phi inst/examples/nonmem/xgxr001dir/backup_* tests_manual/testthat/testOutput From 55ce2d8072b55ad4859c3b790b36f51b2afa1998 Mon Sep 17 00:00:00 2001 From: Philip Delff Date: Sun, 18 Aug 2024 09:11:18 -0400 Subject: [PATCH 2/2] fix tests, quiet merge in NMreadExt() --- R/NMreadExt.R | 2 +- .../testthat/testReference/NMdataConf_01.rds | Bin 368 -> 378 bytes .../testthat/testReference/NMdataConf_02.rds | Bin 366 -> 375 bytes tests/testthat/testReference/NMreadExt_01.rds | Bin 761 -> 814 bytes tests/testthat/testReference/NMreadExt_02.rds | Bin 1760 -> 1807 bytes tests/testthat/testReference/NMreadExt_03.rds | Bin 2422 -> 2479 bytes tests/testthat/testReference/NMreadExt_04.rds | Bin 1643 -> 1691 bytes tests/testthat/testReference/NMreadExt_05.rds | Bin 1821 -> 1871 bytes tests/testthat/testReference/NMrelate_02.rds | Bin 1913 -> 0 bytes tests/testthat/test_NMdataConf.R | 59 ++---------------- tests/testthat/test_NMreadExt.R | 15 ++++- tests/testthat/test_NMrelate.R | 6 ++ 12 files changed, 23 insertions(+), 59 deletions(-) delete mode 100644 tests/testthat/testReference/NMrelate_02.rds diff --git a/R/NMreadExt.R b/R/NMreadExt.R index 931438d3..4a6245af 100644 --- a/R/NMreadExt.R +++ b/R/NMreadExt.R @@ -210,7 +210,7 @@ NMreadExt <- function(file,return,as.fun,modelname,col.model,auto.ext,tableno="m tab.blocks - pars <- mergeCheck(pars,tab.blocks,by=cc(par.type,i),all.x=T) + pars <- mergeCheck(pars,tab.blocks,by=cc(par.type,i),all.x=T,quiet=TRUE) pars[abs(i-j)>(blocksize-1),(c("iblock","blocksize")):=list(NA,NA)] pars[par.type%in%c("OMEGA","SIGMA")&i==j&is.na(iblock),iblock:=i] diff --git a/tests/testthat/testReference/NMdataConf_01.rds b/tests/testthat/testReference/NMdataConf_01.rds index 42c514e4f37921f161519f58708f8faea7d076ee..da4314deb197c6783e3ee72a7cf4d62f70d80351 100644 GIT binary patch literal 378 zcmV-=0fqh_iwFP!000001BFuUPQxG+Wwdj)PGjPpgJ*DwA6ep@F(&$#(c6yL!h~+q zmseqhh7mu00GD&=J*W5FmmDF4QJN$OCpNq=+r*vNtaGylC`Fk)iP`c!uwN+-l0!io z(C!QDz+6zGTg64C9dfh+T7WXqr(;R~VnI=S7R0DiF!*u>Qda;A>NUM>WDD++DY+w^ zNGC-zz6Q}r3IFRrPFmKqim{u!>1~AJ*;RxL8(BadgQAg}HUdZYi}}-RejUNdcsbotUejd_zLS>^eJg+Kc-$9nZK4X_$b{+bf7t`4CVo7qsx&E; z83`}4Lw1VyzU6EM?3J{<>78VZBzfmZe6>Tp#qitlen$ggZ(OSlpIMa z!1yn)hn1wnSj}Z?JULqdtwFo!+p83(R8SIMMKKy2WIz6b!e4+T4W2$W%7QqAF^qMOF z@fu2RgHNj|OGPetGuu+$(PalGDxB6Kv@+LqC|u6W_P^{=XQp8ssBR5uv>Sn7Y9Kq! z4}GfG3fMcbTpT*bR7d(YuoTG9${z4KP7lS8z)*NEy9Y`{BI6#p5%I_K{urlguF2X2 z!Ls2Ukeb>sY7+sv1+x5#?r`JBAxKU%Ftr8U=R>K=jRC^t`rvEQC@rWpBr4HmU_+7I OwEhA!`kUaj0{{TJi?R&> diff --git a/tests/testthat/testReference/NMdataConf_02.rds b/tests/testthat/testReference/NMdataConf_02.rds index a2af14274a20629c14810de456efe6be808a9536..3629bf756a1e1e00cd95dae84097aa0e569af93d 100644 GIT binary patch literal 375 zcmV--0f_z|iwFP!000001AS8MPQxG+Wwdj)PGjPpgJ*DwA6ep@F(&$#(c6yL!h~+q zmseqh%82>{xSUJxIX(Bjj+LB7tb;C zFV9e14c=QtSxj=m%juT#nl5YbPF_CrR{rJqU%n(vZ=-G}s?Z17gZ51POi)#6QYteC zURj6i6z`jrvlXyc((7^LP*B}Qe@qZo3DVmP9DZ6`^-6sssZxS*Rs)jCwQmBnh;P~-r@iJfBCOCh7dQB_; z@fu2RgHNj|ON(6aX11lgqstCXIQ*XvIWya&ySc8-QTC`E(=Y>6w}v#@^*tyV$WHS^ zb1Jq1_D(Dphjua5k=}cj0vY<(1764J!SM(TZu_!(phQ$;+#@#^{&?OW<8;k6S({L> zYMAFv*SR MFT`n8A*ura0P;+#NB{r; diff --git a/tests/testthat/testReference/NMreadExt_01.rds b/tests/testthat/testReference/NMreadExt_01.rds index 8563bfd857b73ccc10d12ee6ede25969a20f3421..d35f9c5db2626c7c8bfa601a596c681cb0f615e3 100644 GIT binary patch literal 814 zcmV+}1JV2+iwFP!000001B>8dU|?WkU}0uvU}6R`nT3Ib02GTeurP1}Y4(criXsC8 z<54cvxC{(@pa8c2zyJnAjRpc`k^oYZ1cgsXoPwqgRz3r)Nq5{Z&s@}j z*?wswo622%Y5V8;tAnpOys|%bBXl~q=L1K_S$o0yPd!-S{e(pkZr*;e$AuvbMi~B6 z(?}?cyq}L@8=1gF(8I*X0?xnYJ13jfa0Z6D zt_6FmJd3O-bvN9+E0+%^3Oo42`HQ6&$$Y&9Dppb4@8Hw`pn;sO@*~81Ym-> z`6;P6u>N9*qmz%TpFd2_&o{_509FB&Bqrsg>J^uy7Qkwag2W=dlFEWqD4!F^2ij1Q zT7;|sWGR%-m@a4w7QH5=8u%bl0-eQXHZ1aKyF71G0vj=ay?k6fsz{&C~5rv|NkYL sLP5REJfI8n5_9y5Q*+XaQqve9O)3!n2gM^L*ctu-0EUDvGUpKh09D;@bN~PV literal 761 zcmV8dU|?WkU}0orU}6R`nT3G_9}o)wu{Z+@11FGXuSl;b zGB7Y6q~YfW|R_&4*abmXlhRno|rlK>{WU4tPTpo)HSq7=>qo!ZU^PxWJy$ zFw`;BL=`c@B4Pv=0f!ihE{KQ`77=t^#u#dhv8XXd6EVTiWrCs01dA>cG!at_b4)SJ zF~u;)6pJ~gFcD^dCoi-pV@=LUEQZAxJRZ{$lS}f8fUJK=sYnutrGQu(h-H9Smb$5k z@jq0L>}a|fjOhl#-QM(y=Bz27Cn=ObjN@j3keY zS+QVbytFm$rYdzdHDu!z=q^H$ta#dp>Ysqk4%CpFdQg_46yK?z(qOgNMoWEFlk<8aypkfup{SHnI5ZVRGccYdIXaAq%pzD)0D)LM7@&4q?}X~k+dS9A!vpR>SgAY zq!#5R=I9lt=A;#+rZGS&Oc4GD#RA|Eh1TD>`6;P6uufQrqmz%TpFd2_&o{_50A?rH z0eZzHsRgj2xFE4eucWd7<|Y=q(Xgm<}87G5iAne>9XDg%AJ$AJ0)} diff --git a/tests/testthat/testReference/NMreadExt_02.rds b/tests/testthat/testReference/NMreadExt_02.rds index 8a1114b3e51a5e000abc30ce0ff834e90faa8be8..5c045cfd4ba9cd8c0eb85ade986e59b0b610e112 100644 GIT binary patch literal 1807 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 literal 2422 zcmV-+35oU}iwFP!000001MOW4P!vZRp4~-x2?EL@ih3F~s0s4)kq12}s}cni5K%+o zDoaFHz}<}xQfD^i$Xz9Op;S^v%Mc%jS}_-sia8{lKti%BAQc1!jYkm?<&2hvN%>Z| zp55tTcXkahu((ivSAG2R_4eQW|I=MPJ#6paNiGyci75w>h!RVf%VGErzK}4|9m4}7 zfO4Rmv2@)0#%5JuUrYm@i9+=n099md)$uBtB|hbQcKRs?Ki}B{7|Q#gt(shl}6>7)(KCwdaa4 zgfh<4%rkN*J1RXfyfB!R-*60X3@L^W#$XIb3@6*x?I1SPZ**#~Qn68?RI@dVAi0K4 z4KicFW-P>vg_^N2mbn;in19f7L6gmMg018Pb2*0IFw-*T1Y61BYlT>p39(WpgqIU) zp%rSO6>3E*l$R4`QBRmfJz*C0gjuO4jO0jSXTQShvO%kray98Ot{+q7t2G%aeAQ+$ zLVYntVvNG@!x-I*Bh-dU|HJdUe2bh?;y zy47J#{n5lr@<_hK9?e@q?od_}%__NSE~+lv66R|Jlm%y4NOb&R%%YqFh?bsfp!YNj)~0 z)OYqLiQ{iCm2>=H`0_6fpcNGFzSFa{Mj6TSxxHn9ZBswA8|E34)OYiY+3Ma|m9Z%x zUA|tytnirygIJ6Iw70j{@RmqovOY_ZYvchM`6{KtEGJckE8$h{8IYE)QK-`8$^f-O znW|ExQpN>1gEkgST=8|P$jRpDCK$7|#o zqNq@7_-{?*o(>rI3~zeOo0O~3E745i$bk7q1zZ3Zzy)vtTmToq1#kge02jaoZ~W?BuJ1TyC*5bH^?I9tL~@$dk+8r0I(H2sE+*) zcJo6dAV7cs0RjXF5FkK+009C7NH+-keKf@;dIBp$SsBhs@>8oQR=z@+rB3zcce6aS z1MNUN&Iw*W{5z()W^bRT9B%pj_sT}CkLO2jeaHuxK-nN)?! zuEc*HyR{7I_NLaVk3B^CFwbQ_?9w28(4(3dsXG@rg-A{>=UnBMq5np@!|(szyrvTA zebbV+AI(AfNe|HJyw6DF654|;f5z*t-&3WnTqKiDB&S#X>Eo5xVwzF@)wdtb+TVoo zcURujzExyVeu%L=J+fg(L7UStboEk}_+hdHwFKVzSLW500C5 zhPgc;kzHul>@g=6U(cqKYEB)WmE=LcGj;3zi{sDG1tCA;4{p%44qDuo6p36zB&U~9 zeJs}PFVS>T=8^9b%HN}RFLz-qh#0;<#ZaC^jw#>Gq&=wiboSeU@>A$Pfm7)_YnPxR zKacw2kC&pNu@hep^F2u-)NqpMRp)#fc~%`fmcrjO1${Y;^M*_F2W9xL{C1WwPE~n zHA;N8V$6mw{ZQid_&b|uf3$SW?LzIaCKBNW6|&{?2hm^cyZb8Azj&dd$y1CfF12_> z-a3FPnt!b>tBE5Kg*Zv{KFixR?N#?NsJv|Fnr8!bsN(*MrTfzNp-Sgg~mgmZ035yT-K+uSTKX?@E=GaU@bxZ%1r`1PPMu5`A=Y zQ{y@5e@k~~+^ye1A1=*PCEq%f8C#mSbrfA2-j3y@`t|2yu$+2Ud*X8<>7#F6{Xi9P zuXOhzf4@Deww31jNv~*&0!#Cr`NxObovX3@mX?$}WMp<>8}khJFx?*7<0$7qfB-R) zE}kp^WZ;pfe^vt!AV7cs0RjXFklrUIr@cJg%bxw1eV}a~=&O4m1omv3kUs4z2pK!} z3?busKtW4cp2yS~D0ZF`qC3z)^<4mgzMALk*|xr#Pwm+@A@kfo^QVvIIc_tkuKDA+I`B7x!g02Cxf#@W*{8?ZG9?^I30Jm64^AX=j!KZlMI=PU z#*hsDkz{74jPVaJvpk=y;{-E2zU|_``06XNg^Q>r;4^7-yM|jdI+^ zH+OdU@RGIpyuHl^^SN`+=kso#v}r!Qb7yCop9eZvouSew*u8=HEw<;6oes0iAMN&Z o3oOq(hzSCzY->e9bGKo^0o#z( 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 diff --git a/tests/testthat/testReference/NMreadExt_05.rds b/tests/testthat/testReference/NMreadExt_05.rds index fd21aac3016ebf8275f0d3e7af6eb2cb79789572..7c45bf9ef699ec94982e73dad770ac04041c1fce 100644 GIT binary patch literal 1871 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 Lx9#jPcZL7}wX}GR diff --git a/tests/testthat/testReference/NMrelate_02.rds b/tests/testthat/testReference/NMrelate_02.rds deleted file mode 100644 index 4d156f2e4f393e6a90ab1cb10d58bae41c56f48d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1913 zcmV-<2Zs0`iwFP!000001MOOSY*SSjKfPVImTh$p5XK`8BFVNw!}^GVG`HJmVYmW& zIA&r(F6$i*O1reB3`}$?A>t!y{6mcik3~P=Q8+C@uF|iT~giE%%&+YZetOT>N5eTxr>Q(ca01+Lsd zI3CvtxIQTAE5x-3S3Ooo@%jbBg+4aI`a+_HNxho3Q7FM(rG;gG$o3K^@4jFsTn6uoSUUN)6pHiBbU=&>vG*cE#0Dthd| zDQa(Ud6qUVCYDXt?PEf)YSFdqVYD^AlVXH6zj%g0>R0ji9l5e&H!tc-8HP;vHnb1HM+$F0DG1D(%bL7{GtXibj8k zDZ&TRpIH6@-zbhFp+XPIpULu5ea5lF`%hn+x&6_q7LBuf$!lddCx7eI?z_=k@y-_K zgtyvuH4VJv)Eta#{rY>iVm!xd=WP7TxKqJDd+hbHkKPNA{8S6Q|KM!u?JYM|nuN<{ zMAm;V0w!Y3!De_0Xm7S28Qs}uRVA9~rKCG{S?Z0-1JMtGZ&UpF|k=8?^r^4~e{ z1a$$OKA_Sh_`i3nZtlZZj?ka}d8%`~{v>^PB!|&^(yq8u~&WJ zTy;vNDJ}nVpxp20f81bwK#<{|$hS5{vrb!@j7*5+DJS7)gkT@BOdyw~D|aJWtGI#*j89=C~mSjf?*r%E1z`v-)8+z%Y+RUG>0`~IFxv;=RUZ>Hhd1=GB5lAlwh(56 zQUT5=Y|>tMSuMV3-OXKKEW-HKfn-54E~BwA5FKsO`Iwc_DZ`$6St7oqV9LBq zm@)J7Cgb#Q(?l$eAsAS1h6O5xqZsdltAt>=xz~?};b(m25bNs+vOP$EI=DJ4*8B=* ze1&<4O8OrgJ@`9D|IpAokx){7iW^Oj68q->j5k}jJLu0Q?k)wbVcaB^QY_AIApsZW zq2`>03lo6%qDx+dl<0D-CC?+oIlJWI8Gg?Z;#jAK6s_gu29PSsE0r^f`qC}Do#&7mPE3`uS)vJrQlDB2qGYRQ9TJFd4SvjQYS&!1U(5NYJi{tVkSYll3Fi7vH-aP z#3^Y#BBBHck_7q5wf&RGZGuWdt_(?T1?dLnQF$sVECm3vX-73Cmm0mdA-7sQEjFpe z&q7oBaj2HONaX{Qj07gBhMol@NFHh468JifpARUrzHW+uvIP7c>x8+aNV)HsyO7=W z_M6B(HqK2l&TTvjiNdIIAQen4_lo~|xonttDGO>mz90A1lQofkDDj*^D$RbfHOK%m zANwboiuNJ?WuUw%jG03!*9f%+mHj*RkbXK>4^@a>Xvz`+X|yVb@!$oOAsaXz^eKS=2#)A{oFT+V_uiGV9caSJ3=$TTvNA1loa>?E6B zKnA@EyUKI`;q%Xa8kjJi45w=W2t%Y*l_Z;1MS?P<9hEdF!A_FtPb6rg7>_btDXINN zrYFTpM