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

diff --git a/tests/testthat/_snaps/plot/mkinparplot-for-focus-c-sfo.svg b/tests/testthat/_snaps/plot/mkinparplot-for-focus-c-sfo.svg
new file mode 100644
index 00000000..0b9a91b0
--- /dev/null
+++ b/tests/testthat/_snaps/plot/mkinparplot-for-focus-c-sfo.svg
@@ -0,0 +1,96 @@
+<?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=)'>
+<polygon points='30.24,257.76 689.76,257.76 689.76,1.44 30.24,1.44 ' style='stroke-width: 0.75; fill: none;' />
+<line x1='54.67' y1='257.76' x2='579.07' y2='257.76' style='stroke-width: 0.75;' />
+<line x1='54.67' y1='257.76' x2='54.67' y2='264.96' style='stroke-width: 0.75;' />
+<line x1='185.77' y1='257.76' x2='185.77' y2='264.96' style='stroke-width: 0.75;' />
+<line x1='316.87' y1='257.76' x2='316.87' y2='264.96' style='stroke-width: 0.75;' />
+<line x1='447.97' y1='257.76' x2='447.97' y2='264.96' style='stroke-width: 0.75;' />
+<line x1='579.07' y1='257.76' x2='579.07' y2='264.96' style='stroke-width: 0.75;' />
+<text x='54.67' y='283.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text x='185.77' y='283.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text x='316.87' y='283.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text x='447.97' y='283.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>60</text>
+<text x='579.07' y='283.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>80</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHw3MjAuMDB8MC4wMHwyODguMDA='>
+    <rect x='0.00' y='0.00' width='720.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHwyODguMDA=)'>
+</g>
+<defs>
+  <clipPath id='cpMzAuMjR8Njg5Ljc2fDEuNDR8MjU3Ljc2'>
+    <rect x='30.24' y='1.44' width='659.52' height='256.32' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzAuMjR8Njg5Ljc2fDEuNDR8MjU3Ljc2)'>
+<rect x='592.70' y='126.90' width='5.40' height='5.40' style='stroke-width: 0.75;' />
+<text x='61.87' y='132.35' style='font-size: 12.00px; font-family: sans;' textLength='47.38px' lengthAdjust='spacingAndGlyphs'>parent_0</text>
+<line x1='525.48' y1='129.60' x2='665.33' y2='129.60' style='stroke-width: 0.75;' />
+<polyline points='525.48,126.00 525.48,129.60 525.48,133.20 ' style='stroke-width: 0.75;' />
+<polyline points='665.33,133.20 665.33,129.60 665.33,126.00 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpMzAuMjR8Njg5Ljc2fDI4OS40NHw1NDUuNzY='>
+    <rect x='30.24' y='289.44' width='659.52' height='256.32' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzAuMjR8Njg5Ljc2fDI4OS40NHw1NDUuNzY=)'>
+</g>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
+<polygon points='30.24,545.76 689.76,545.76 689.76,289.44 30.24,289.44 ' style='stroke-width: 0.75; fill: none;' />
+<line x1='54.67' y1='545.76' x2='604.75' y2='545.76' style='stroke-width: 0.75;' />
+<line x1='54.67' y1='545.76' x2='54.67' y2='552.96' style='stroke-width: 0.75;' />
+<line x1='192.19' y1='545.76' x2='192.19' y2='552.96' style='stroke-width: 0.75;' />
+<line x1='329.71' y1='545.76' x2='329.71' y2='552.96' style='stroke-width: 0.75;' />
+<line x1='467.23' y1='545.76' x2='467.23' y2='552.96' style='stroke-width: 0.75;' />
+<line x1='604.75' y1='545.76' x2='604.75' y2='552.96' style='stroke-width: 0.75;' />
+<text x='54.67' y='571.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='16.68px' lengthAdjust='spacingAndGlyphs'>0.0</text>
+<text x='192.19' y='571.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='16.68px' lengthAdjust='spacingAndGlyphs'>0.1</text>
+<text x='329.71' y='571.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='16.68px' lengthAdjust='spacingAndGlyphs'>0.2</text>
+<text x='467.23' y='571.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='16.68px' lengthAdjust='spacingAndGlyphs'>0.3</text>
+<text x='604.75' y='571.68' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='16.68px' lengthAdjust='spacingAndGlyphs'>0.4</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHw3MjAuMDB8Mjg4LjAwfDU3Ni4wMA=='>
+    <rect x='0.00' y='288.00' width='720.00' height='288.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw3MjAuMDB8Mjg4LjAwfDU3Ni4wMA==)'>
+</g>
+<g clip-path='url(#cpMzAuMjR8Njg5Ljc2fDI4OS40NHw1NDUuNzY=)'>
+<rect x='472.87' y='414.90' width='5.40' height='5.40' style='stroke-width: 0.75;' />
+<line x1='54.67' y1='545.76' x2='54.67' y2='289.44' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<text x='61.87' y='420.35' style='font-size: 12.00px; font-family: sans;' textLength='46.71px' lengthAdjust='spacingAndGlyphs'>k_parent</text>
+<line x1='344.77' y1='417.60' x2='665.33' y2='417.60' style='stroke-width: 0.75;' />
+<polyline points='344.77,414.00 344.77,417.60 344.77,421.20 ' style='stroke-width: 0.75;' />
+<polyline points='665.33,421.20 665.33,417.60 665.33,414.00 ' style='stroke-width: 0.75;' />
+</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>