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, 67 insertions, 0 deletions

diff --git a/tests/testthat/_snaps/plot/mkinerrplot-for-focus-c-sfo.svg b/tests/testthat/_snaps/plot/mkinerrplot-for-focus-c-sfo.svg
new file mode 100644
index 00000000..84768b51
--- /dev/null
+++ b/tests/testthat/_snaps/plot/mkinerrplot-for-focus-c-sfo.svg
@@ -0,0 +1,67 @@
+<?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='82.40' y1='502.56' x2='597.27' y2='502.56' style='stroke-width: 0.75;' />
+<line x1='82.40' y1='502.56' x2='82.40' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='211.12' y1='502.56' x2='211.12' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='339.83' y1='502.56' x2='339.83' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='468.55' y1='502.56' x2='468.55' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='597.27' y1='502.56' x2='597.27' y2='509.76' style='stroke-width: 0.75;' />
+<text x='82.40' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text x='211.12' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text x='339.83' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text x='468.55' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>60</text>
+<text x='597.27' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>80</text>
+<line x1='59.04' y1='486.13' x2='59.04' y2='112.81' 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='392.80' x2='51.84' y2='392.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='299.47' x2='51.84' y2='299.47' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='206.14' x2='51.84' y2='206.14' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='112.81' x2='51.84' y2='112.81' 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,392.80) 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,299.47) 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,206.14) 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,112.81) 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 689.76,502.56 689.76,59.04 59.04,59.04 ' style='stroke-width: 0.75; fill: none;' />
+<text x='374.40' y='557.28' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='50.70px' lengthAdjust='spacingAndGlyphs'>Predicted</text>
+<text transform='translate(12.96,280.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='90.73px' lengthAdjust='spacingAndGlyphs'>Squared residual</text>
+</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==)'>
+<circle cx='613.31' cy='454.40' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='473.33' cy='448.43' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='294.36' cy='443.17' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='144.71' cy='373.26' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='89.71' cy='143.91' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='82.50' cy='283.82' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='82.40' cy='411.47' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='82.40' cy='415.16' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='82.40' cy='484.45' r='2.70' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='384.23' x2='689.76' y2='384.23' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<rect x='597.20' y='81.22' width='61.03' height='28.80' style='stroke-width: 0.75; fill: #FFFFFF;' />
+<circle cx='608.00' cy='95.62' r='2.70' style='stroke-width: 0.75;' />
+<text x='618.80' y='99.75' style='font-size: 12.00px; font-family: sans;' textLength='34.03px' lengthAdjust='spacingAndGlyphs'>parent</text>
+</g>
+</svg>