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, 63 deletions

diff --git a/tests/figs/plotting/mkinfit-plot-for-focus-c-with-defaults.svg b/tests/figs/plotting/mkinfit-plot-for-focus-c-with-defaults.svg
deleted file mode 100644
index ef238a51..00000000
--- a/tests/figs/plotting/mkinfit-plot-for-focus-c-with-defaults.svg
+++ /dev/null
@@ -1,63 +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;'/>
-<line x1='82.40' y1='502.56' x2='671.31' 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='180.55' y1='502.56' x2='180.55' y2='509.76' style='stroke-width: 0.75;' />
-<line x1='278.70' y1='502.56' x2='278.70' y2='509.76' style='stroke-width: 0.75;' />
-<line x1='376.85' y1='502.56' x2='376.85' y2='509.76' style='stroke-width: 0.75;' />
-<line x1='475.01' y1='502.56' x2='475.01' y2='509.76' style='stroke-width: 0.75;' />
-<line x1='573.16' y1='502.56' x2='573.16' y2='509.76' style='stroke-width: 0.75;' />
-<line x1='671.31' y1='502.56' x2='671.31' y2='509.76' style='stroke-width: 0.75;' />
-<text x='79.06' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
-<text x='173.88' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
-<text x='272.03' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
-<text x='370.18' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text>
-<text x='468.33' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text>
-<text x='563.15' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>100</text>
-<text x='661.30' y='528.48' style='font-size: 12.00px; font-family: Liberation 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,489.47) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
-<text transform='translate(41.76,396.29) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
-<text transform='translate(41.76,299.78) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
-<text transform='translate(41.76,203.26) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text>
-<text transform='translate(41.76,106.75) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text>
-<polyline points='59.04,502.56 689.76,502.56 689.76,59.04 59.04,59.04 59.04,502.56 ' style='stroke-width: 0.75;' />
-<text x='361.29' y='557.28' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='26.22px' lengthAdjust='spacingAndGlyphs'>Time</text>
-<text transform='translate(12.96,302.82) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='44.03px' lengthAdjust='spacingAndGlyphs'>Residue</text>
-<defs>
-  <clipPath id='cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA=='>
-    <rect x='59.04' y='59.04' width='630.72' height='443.52' />
-  </clipPath>
-</defs>
-<circle cx='82.40' cy='75.47' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='87.31' cy='206.73' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='97.12' cy='341.85' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='116.75' cy='415.68' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='151.11' cy='439.32' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='219.81' cy='454.28' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='391.58' cy='466.83' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='528.99' cy='467.31' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='666.40' cy='483.24' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<polyline points='82.40,88.05 88.30,210.58 94.20,295.40 100.10,354.11 106.00,394.75 111.89,422.88 117.79,442.35 123.69,455.83 129.59,465.15 135.49,471.61 141.39,476.08 147.29,479.18 153.19,481.32 159.09,482.80 164.99,483.83 170.88,484.54 176.78,485.03 182.68,485.37 188.58,485.60 194.48,485.77 200.38,485.88 206.28,485.96 212.18,486.01 218.08,486.05 223.98,486.08 229.87,486.09 235.77,486.11 241.67,486.11 247.57,486.12 253.47,486.12 259.37,486.13 265.27,486.13 271.17,486.13 277.07,486.13 282.97,486.13 288.86,486.13 294.76,486.13 300.66,486.13 306.56,486.13 312.46,486.13 318.36,486.13 324.26,486.13 330.16,486.13 336.06,486.13 341.96,486.13 347.85,486.13 353.75,486.13 359.65,486.13 365.55,486.13 371.45,486.13 377.35,486.13 383.25,486.13 389.15,486.13 395.05,486.13 400.95,486.13 406.84,486.13 412.74,486.13 418.64,486.13 424.54,486.13 430.44,486.13 436.34,486.13 442.24,486.13 448.14,486.13 454.04,486.13 459.94,486.13 465.83,486.13 471.73,486.13 477.63,486.13 483.53,486.13 489.43,486.13 495.33,486.13 501.23,486.13 507.13,486.13 513.03,486.13 518.93,486.13 524.82,486.13 530.72,486.13 536.62,486.13 542.52,486.13 548.42,486.13 554.32,486.13 560.22,486.13 566.12,486.13 572.02,486.13 577.92,486.13 583.81,486.13 589.71,486.13 595.61,486.13 601.51,486.13 607.41,486.13 613.31,486.13 619.21,486.13 625.11,486.13 631.01,486.13 636.91,486.13 642.80,486.13 648.70,486.13 654.60,486.13 660.50,486.13 666.40,486.13 ' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<rect x='583.17' y='81.22' width='75.06' height='28.80' style='stroke-width: 0.75; fill: #FFFFFF;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<line x1='586.41' y1='95.62' x2='608.01' y2='95.62' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<circle cx='597.21' cy='95.62' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)' />
-<g clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA==)'><text x='618.81' y='99.74' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='34.02px' lengthAdjust='spacingAndGlyphs'>parent</text></g>
-</svg>