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

diff --git a/tests/figs/plotting/mkinparplot-for-focus-c-sfo.svg b/tests/figs/plotting/mkinparplot-for-focus-c-sfo.svg
deleted file mode 100644
index 62590397..00000000
--- a/tests/figs/plotting/mkinparplot-for-focus-c-sfo.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 720.00 576.00'>
-<defs>
-  <style type='text/css'><![CDATA[
-    line, polyline, polygon, path, rect, 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;'/>
-<polyline points='30.24,257.76 689.76,257.76 689.76,1.44 30.24,1.44 30.24,257.76 ' style='stroke-width: 0.75;' />
-<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='51.33' y='283.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
-<text x='179.10' y='283.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
-<text x='310.20' y='283.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
-<text x='441.30' y='283.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text>
-<text x='572.40' y='283.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text>
-<defs>
-  <clipPath id='cpMC4wMHw3MjAuMDB8Mjg4LjAwfDAuMDA='>
-    <rect x='0.00' y='0.00' width='720.00' height='288.00' />
-  </clipPath>
-</defs>
-<defs>
-  <clipPath id='cpMzAuMjR8Njg5Ljc2fDI1Ny43NnwxLjQ0'>
-    <rect x='30.24' y='1.44' width='659.52' height='256.32' />
-  </clipPath>
-</defs>
-<rect x='592.70' y='126.90' width='5.40' height='5.40' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDI1Ny43NnwxLjQ0)' />
-<g clip-path='url(#cpMzAuMjR8Njg5Ljc2fDI1Ny43NnwxLjQ0)'><text x='61.87' y='132.35' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='47.36px' lengthAdjust='spacingAndGlyphs'>parent_0</text></g>
-<line x1='525.48' y1='129.60' x2='665.33' y2='129.60' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDI1Ny43NnwxLjQ0)' />
-<polyline points='525.48,126.00 525.48,129.60 525.48,133.20 ' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDI1Ny43NnwxLjQ0)' />
-<polyline points='665.33,133.20 665.33,129.60 665.33,126.00 ' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDI1Ny43NnwxLjQ0)' />
-<defs>
-  <clipPath id='cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ='>
-    <rect x='30.24' y='289.44' width='659.52' height='256.32' />
-  </clipPath>
-</defs>
-<defs>
-  <clipPath id='cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA='>
-    <rect x='0.00' y='0.00' width='720.00' height='576.00' />
-  </clipPath>
-</defs>
-<polyline points='30.24,545.76 689.76,545.76 689.76,289.44 30.24,289.44 30.24,545.76 ' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='54.67' y1='545.76' x2='604.75' y2='545.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='54.67' y1='545.76' x2='54.67' y2='552.96' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='192.19' y1='545.76' x2='192.19' y2='552.96' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='329.71' y1='545.76' x2='329.71' y2='552.96' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='467.23' y1='545.76' x2='467.23' y2='552.96' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='604.75' y1='545.76' x2='604.75' y2='552.96' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='46.33' y='571.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.0</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='183.85' y='571.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.1</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='321.37' y='571.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.2</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='458.89' y='571.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.3</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='596.42' y='571.68' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.4</text></g>
-<defs>
-  <clipPath id='cpMC4wMHw3MjAuMDB8NTc2LjAwfDI4OC4wMA=='>
-    <rect x='0.00' y='288.00' width='720.00' height='288.00' />
-  </clipPath>
-</defs>
-<defs>
-  <clipPath id='cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ='>
-    <rect x='30.24' y='289.44' width='659.52' height='256.32' />
-  </clipPath>
-</defs>
-<rect x='472.87' y='414.90' width='5.40' height='5.40' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ=)' />
-<line x1='54.67' y1='545.76' x2='54.67' y2='289.44' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ=)' />
-<g clip-path='url(#cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ=)'><text x='61.87' y='420.35' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='46.69px' lengthAdjust='spacingAndGlyphs'>k_parent</text></g>
-<line x1='344.77' y1='417.60' x2='665.33' y2='417.60' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ=)' />
-<polyline points='344.77,414.00 344.77,417.60 344.77,421.20 ' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ=)' />
-<polyline points='665.33,421.20 665.33,417.60 665.33,414.00 ' style='stroke-width: 0.75;' clip-path='url(#cpMzAuMjR8Njg5Ljc2fDU0NS43NnwyODkuNDQ=)' />
-<defs>
-  <clipPath id='cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA=='>
-    <rect x='59.04' y='59.04' width='630.72' height='443.52' />
-  </clipPath>
-</defs>
-</svg>