Merge branch 'master' into nlmixr

After the merge, run make test and accept the new snapshot for the mixed
model fit for an nlme object

1 files changed, 143 insertions, 0 deletions

diff --git a/tests/testthat/_snaps/plot/plot-res-for-focus-c.svg b/tests/testthat/_snaps/plot/plot-res-for-focus-c.svg
new file mode 100644
index 00000000..05699fae
--- /dev/null
+++ b/tests/testthat/_snaps/plot/plot-res-for-focus-c.svg
@@ -0,0 +1,143 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' class='svglite' data-engine-version='2.0' width='720.00pt' height='576.00pt' viewBox='0 0 720.00 576.00'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA='>
+    <rect x='0.00' y='0.00' width='720.00' height='576.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<line x1='69.07' y1='502.56' x2='321.84' y2='502.56' style='stroke-width: 0.75;' />
+<line x1='69.07' y1='502.56' x2='69.07' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='111.20' y1='502.56' x2='111.20' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='153.32' y1='502.56' x2='153.32' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='195.45' y1='502.56' x2='195.45' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='237.58' y1='502.56' x2='237.58' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='279.71' y1='502.56' x2='279.71' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='321.84' y1='502.56' x2='321.84' y2='509.76' style='stroke-width: 0.75;' />
+<text x='69.07' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text x='111.20' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text x='153.32' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text x='195.45' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>60</text>
+<text x='237.58' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>80</text>
+<text x='279.71' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>100</text>
+<text x='321.84' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>120</text>
+<line x1='59.04' y1='486.13' x2='59.04' y2='100.08' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='486.13' x2='51.84' y2='486.13' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='389.62' x2='51.84' y2='389.62' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='293.11' x2='51.84' y2='293.11' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='196.59' x2='51.84' y2='196.59' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='100.08' x2='51.84' y2='100.08' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,486.13) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,389.62) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text transform='translate(41.76,293.11) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text transform='translate(41.76,196.59) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>60</text>
+<text transform='translate(41.76,100.08) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>80</text>
+<polygon points='59.04,502.56 329.76,502.56 329.76,59.04 59.04,59.04 ' style='stroke-width: 0.75; fill: none;' />
+</g>
+<defs>
+  <clipPath id='cpMC4wMHwzNjAuMDB8MC4wMHw1NzYuMDA='>
+    <rect x='0.00' y='0.00' width='360.00' height='576.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHwzNjAuMDB8MC4wMHw1NzYuMDA=)'>
+<text x='194.40' y='557.28' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='26.67px' lengthAdjust='spacingAndGlyphs'>Time</text>
+<text transform='translate(12.96,280.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='44.04px' lengthAdjust='spacingAndGlyphs'>Residue</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8MzI5Ljc2fDU5LjA0fDUwMi41Ng=='>
+    <rect x='59.04' y='59.04' width='270.72' height='443.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8MzI5Ljc2fDU5LjA0fDUwMi41Ng==)'>
+<circle cx='69.07' cy='75.47' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='71.17' cy='206.73' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='75.39' cy='341.85' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='83.81' cy='415.68' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='98.56' cy='439.32' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='128.05' cy='454.28' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='201.77' cy='466.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='260.75' cy='467.31' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='319.73' cy='483.24' r='2.70' style='stroke-width: 0.75;' />
+<polyline points='69.07,88.05 71.60,210.58 74.13,295.40 76.66,354.11 79.19,394.75 81.73,422.88 84.26,442.35 86.79,455.83 89.32,465.15 91.85,471.61 94.39,476.08 96.92,479.18 99.45,481.32 101.98,482.80 104.51,483.83 107.05,484.54 109.58,485.03 112.11,485.37 114.64,485.60 117.17,485.77 119.71,485.88 122.24,485.96 124.77,486.01 127.30,486.05 129.83,486.08 132.37,486.09 134.90,486.11 137.43,486.11 139.96,486.12 142.49,486.12 145.03,486.13 147.56,486.13 150.09,486.13 152.62,486.13 155.15,486.13 157.69,486.13 160.22,486.13 162.75,486.13 165.28,486.13 167.81,486.13 170.35,486.13 172.88,486.13 175.41,486.13 177.94,486.13 180.47,486.13 183.01,486.13 185.54,486.13 188.07,486.13 190.60,486.13 193.13,486.13 195.67,486.13 198.20,486.13 200.73,486.13 203.26,486.13 205.79,486.13 208.33,486.13 210.86,486.13 213.39,486.13 215.92,486.13 218.45,486.13 220.99,486.13 223.52,486.13 226.05,486.13 228.58,486.13 231.11,486.13 233.65,486.13 236.18,486.13 238.71,486.13 241.24,486.13 243.77,486.13 246.31,486.13 248.84,486.13 251.37,486.13 253.90,486.13 256.43,486.13 258.97,486.13 261.50,486.13 264.03,486.13 266.56,486.13 269.09,486.13 271.63,486.13 274.16,486.13 276.69,486.13 279.22,486.13 281.75,486.13 284.29,486.13 286.82,486.13 289.35,486.13 291.88,486.13 294.41,486.13 296.95,486.13 299.48,486.13 302.01,486.13 304.54,486.13 307.07,486.13 309.61,486.13 312.14,486.13 314.67,486.13 317.20,486.13 319.73,486.13 ' style='stroke-width: 0.75;' />
+<rect x='241.16' y='81.22' width='75.07' height='28.80' style='stroke-width: 0.75; fill: #FFFFFF;' />
+<line x1='244.40' y1='95.62' x2='266.00' y2='95.62' style='stroke-width: 0.75;' />
+<circle cx='255.20' cy='95.62' r='2.70' style='stroke-width: 0.75;' />
+<text x='276.80' y='99.75' style='font-size: 12.00px; font-family: sans;' textLength='34.03px' lengthAdjust='spacingAndGlyphs'>parent</text>
+</g>
+<defs>
+  <clipPath id='cpNDE5LjA0fDY4OS43Nnw1OS4wNHw1MDIuNTY='>
+    <rect x='419.04' y='59.04' width='270.72' height='443.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNDE5LjA0fDY4OS43Nnw1OS4wNHw1MDIuNTY=)'>
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<line x1='429.07' y1='502.56' x2='681.84' y2='502.56' style='stroke-width: 0.75;' />
+<line x1='429.07' y1='502.56' x2='429.07' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='471.20' y1='502.56' x2='471.20' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='513.32' y1='502.56' x2='513.32' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='555.45' y1='502.56' x2='555.45' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='597.58' y1='502.56' x2='597.58' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='639.71' y1='502.56' x2='639.71' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='681.84' y1='502.56' x2='681.84' y2='509.76' style='stroke-width: 0.75;' />
+<text x='429.07' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text x='471.20' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text x='513.32' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text x='555.45' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>60</text>
+<text x='597.58' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>80</text>
+<text x='639.71' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>100</text>
+<text x='681.84' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>120</text>
+<line x1='419.04' y1='480.61' x2='419.04' y2='80.99' style='stroke-width: 0.75;' />
+<line x1='419.04' y1='480.61' x2='411.84' y2='480.61' style='stroke-width: 0.75;' />
+<line x1='419.04' y1='380.71' x2='411.84' y2='380.71' style='stroke-width: 0.75;' />
+<line x1='419.04' y1='280.80' x2='411.84' y2='280.80' style='stroke-width: 0.75;' />
+<line x1='419.04' y1='180.89' x2='411.84' y2='180.89' style='stroke-width: 0.75;' />
+<line x1='419.04' y1='80.99' x2='411.84' y2='80.99' style='stroke-width: 0.75;' />
+<text transform='translate(401.76,480.61) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>-10</text>
+<text transform='translate(401.76,380.71) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='10.67px' lengthAdjust='spacingAndGlyphs'>-5</text>
+<text transform='translate(401.76,280.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(401.76,180.89) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text transform='translate(401.76,80.99) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>10</text>
+<polygon points='419.04,502.56 689.76,502.56 689.76,59.04 419.04,59.04 ' style='stroke-width: 0.75; fill: none;' />
+</g>
+<defs>
+  <clipPath id='cpMzYwLjAwfDcyMC4wMHwwLjAwfDU3Ni4wMA=='>
+    <rect x='360.00' y='0.00' width='360.00' height='576.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzYwLjAwfDcyMC4wMHwwLjAwfDU3Ni4wMA==)'>
+<text x='554.40' y='557.28' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='26.67px' lengthAdjust='spacingAndGlyphs'>Time</text>
+<text transform='translate(372.96,280.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='46.70px' lengthAdjust='spacingAndGlyphs'>Residual</text>
+</g>
+<g clip-path='url(#cpNDE5LjA0fDY4OS43Nnw1OS4wNHw1MDIuNTY=)'>
+<circle cx='429.07' cy='228.69' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='431.17' cy='337.59' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='435.39' cy='341.43' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='443.81' cy='182.53' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.56' cy='109.69' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='488.05' cy='149.24' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='561.77' cy='200.88' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='620.75' cy='202.87' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='679.73' cy='268.81' r='2.70' style='stroke-width: 0.75;' />
+<line x1='419.04' y1='280.80' x2='689.76' y2='280.80' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8Njg5Ljc2fDU5LjA0fDUwMi41Ng=='>
+    <rect x='59.04' y='59.04' width='630.72' height='443.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8Njg5Ljc2fDU5LjA0fDUwMi41Ng==)'>
+</g>
+</svg>