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

diff --git a/tests/figs/plotting/mkinfit-plot-for-focus-c-with-residuals-like-in-gmkin.svg b/tests/figs/plotting/mkinfit-plot-for-focus-c-with-residuals-like-in-gmkin.svg
deleted file mode 100644
index bef1556f..00000000
--- a/tests/figs/plotting/mkinfit-plot-for-focus-c-with-residuals-like-in-gmkin.svg
+++ /dev/null
@@ -1,132 +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='304.45' x2='671.31' y2='304.45' style='stroke-width: 0.75;' />
-<line x1='82.40' y1='304.45' x2='82.40' y2='311.65' style='stroke-width: 0.75;' />
-<line x1='180.55' y1='304.45' x2='180.55' y2='311.65' style='stroke-width: 0.75;' />
-<line x1='278.70' y1='304.45' x2='278.70' y2='311.65' style='stroke-width: 0.75;' />
-<line x1='376.85' y1='304.45' x2='376.85' y2='311.65' style='stroke-width: 0.75;' />
-<line x1='475.01' y1='304.45' x2='475.01' y2='311.65' style='stroke-width: 0.75;' />
-<line x1='573.16' y1='304.45' x2='573.16' y2='311.65' style='stroke-width: 0.75;' />
-<line x1='671.31' y1='304.45' x2='671.31' y2='311.65' style='stroke-width: 0.75;' />
-<text x='79.06' y='330.37' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
-<text x='173.88' y='330.37' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
-<text x='272.03' y='330.37' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
-<text x='370.18' y='330.37' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text>
-<text x='468.33' y='330.37' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text>
-<text x='563.15' y='330.37' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>100</text>
-<text x='661.30' y='330.37' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>120</text>
-<line x1='59.04' y1='295.36' x2='59.04' y2='81.75' style='stroke-width: 0.75;' />
-<line x1='59.04' y1='295.36' x2='51.84' y2='295.36' style='stroke-width: 0.75;' />
-<line x1='59.04' y1='241.96' x2='51.84' y2='241.96' style='stroke-width: 0.75;' />
-<line x1='59.04' y1='188.55' x2='51.84' y2='188.55' style='stroke-width: 0.75;' />
-<line x1='59.04' y1='135.15' x2='51.84' y2='135.15' style='stroke-width: 0.75;' />
-<line x1='59.04' y1='81.75' x2='51.84' y2='81.75' style='stroke-width: 0.75;' />
-<text transform='translate(41.76,298.70) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
-<text transform='translate(41.76,248.63) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
-<text transform='translate(41.76,195.23) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
-<text transform='translate(41.76,141.82) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text>
-<text transform='translate(41.76,88.42) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text>
-<polyline points='59.04,304.45 689.76,304.45 689.76,59.04 59.04,59.04 59.04,304.45 ' style='stroke-width: 0.75;' />
-<defs>
-  <clipPath id='cpMC4wMHw3MjAuMDB8MzQ5LjA5fDAuMDA='>
-    <rect x='0.00' y='0.00' width='720.00' height='349.09' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MzQ5LjA5fDAuMDA=)'><text x='361.29' y='359.17' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='26.22px' lengthAdjust='spacingAndGlyphs'>Time</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8MzQ5LjA5fDAuMDA=)'><text transform='translate(12.96,203.76) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='44.03px' lengthAdjust='spacingAndGlyphs'>Residue</text></g>
-<defs>
-  <clipPath id='cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA=='>
-    <rect x='59.04' y='59.04' width='630.72' height='245.41' />
-  </clipPath>
-</defs>
-<circle cx='82.40' cy='68.13' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='87.31' cy='140.76' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='97.12' cy='215.52' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='116.75' cy='256.38' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='151.11' cy='269.46' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='219.81' cy='277.74' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='391.58' cy='284.68' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='528.99' cy='284.95' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='666.40' cy='293.76' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<polyline points='82.40,75.09 88.30,142.89 94.20,189.82 100.10,222.31 106.00,244.80 111.89,260.36 117.79,271.13 123.69,278.59 129.59,283.75 135.49,287.33 141.39,289.80 147.29,291.51 153.19,292.70 159.09,293.52 164.99,294.08 170.88,294.48 176.78,294.75 182.68,294.94 188.58,295.07 194.48,295.16 200.38,295.22 206.28,295.26 212.18,295.29 218.08,295.32 223.98,295.33 229.87,295.34 235.77,295.35 241.67,295.35 247.57,295.35 253.47,295.36 259.37,295.36 265.27,295.36 271.17,295.36 277.07,295.36 282.97,295.36 288.86,295.36 294.76,295.36 300.66,295.36 306.56,295.36 312.46,295.36 318.36,295.36 324.26,295.36 330.16,295.36 336.06,295.36 341.96,295.36 347.85,295.36 353.75,295.36 359.65,295.36 365.55,295.36 371.45,295.36 377.35,295.36 383.25,295.36 389.15,295.36 395.05,295.36 400.95,295.36 406.84,295.36 412.74,295.36 418.64,295.36 424.54,295.36 430.44,295.36 436.34,295.36 442.24,295.36 448.14,295.36 454.04,295.36 459.94,295.36 465.83,295.36 471.73,295.36 477.63,295.36 483.53,295.36 489.43,295.36 495.33,295.36 501.23,295.36 507.13,295.36 513.03,295.36 518.93,295.36 524.82,295.36 530.72,295.36 536.62,295.36 542.52,295.36 548.42,295.36 554.32,295.36 560.22,295.36 566.12,295.36 572.02,295.36 577.92,295.36 583.81,295.36 589.71,295.36 595.61,295.36 601.51,295.36 607.41,295.36 613.31,295.36 619.21,295.36 625.11,295.36 631.01,295.36 636.91,295.36 642.80,295.36 648.70,295.36 654.60,295.36 660.50,295.36 666.40,295.36 ' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<rect x='583.17' y='71.31' width='75.06' height='28.80' style='stroke-width: 0.75; fill: #FFFFFF;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<line x1='586.41' y1='85.71' x2='608.01' y2='85.71' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<circle cx='597.21' cy='85.71' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)' />
-<g clip-path='url(#cpNTkuMDR8Njg5Ljc2fDMwNC40NXw1OS4wNA==)'><text x='618.81' y='89.84' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='34.02px' lengthAdjust='spacingAndGlyphs'>parent</text></g>
-<defs>
-  <clipPath id='cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM='>
-    <rect x='59.04' y='350.53' width='630.72' height='152.03' />
-  </clipPath>
-</defs>
-<defs>
-  <clipPath id='cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA='>
-    <rect x='0.00' y='0.00' width='720.00' height='576.00' />
-  </clipPath>
-</defs>
-<line x1='82.40' y1='502.56' x2='671.31' y2='502.56' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='82.40' y1='502.56' x2='82.40' y2='509.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='180.55' y1='502.56' x2='180.55' y2='509.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='278.70' y1='502.56' x2='278.70' y2='509.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='376.85' y1='502.56' x2='376.85' y2='509.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='475.01' y1='502.56' x2='475.01' y2='509.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='573.16' y1='502.56' x2='573.16' y2='509.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='671.31' y1='502.56' x2='671.31' y2='509.76' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='79.06' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='173.88' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='272.03' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='370.18' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='468.33' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='563.15' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>100</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text x='661.30' y='528.48' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>120</text></g>
-<line x1='59.04' y1='495.04' x2='59.04' y2='358.05' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='59.04' y1='495.04' x2='51.84' y2='495.04' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='59.04' y1='460.79' x2='51.84' y2='460.79' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='59.04' y1='426.55' x2='51.84' y2='426.55' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='59.04' y1='392.30' x2='51.84' y2='392.30' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<line x1='59.04' y1='358.05' x2='51.84' y2='358.05' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(41.76,503.71) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>-10</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(41.76,466.13) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='10.67px' lengthAdjust='spacingAndGlyphs'>-5</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(41.76,429.88) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(41.76,395.64) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)'><text transform='translate(41.76,364.73) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text></g>
-<polyline points='59.04,502.56 689.76,502.56 689.76,350.53 59.04,350.53 59.04,502.56 ' style='stroke-width: 0.75;' clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDAuMDA=)' />
-<defs>
-  <clipPath id='cpMC4wMHw3MjAuMDB8NTc2LjAwfDM0OS4wOQ=='>
-    <rect x='0.00' y='349.09' width='720.00' height='226.91' />
-  </clipPath>
-</defs>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDM0OS4wOQ==)'><text x='361.29' y='557.28' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='26.22px' lengthAdjust='spacingAndGlyphs'>Time</text></g>
-<g clip-path='url(#cpMC4wMHw3MjAuMDB8NTc2LjAwfDM0OS4wOQ==)'><text transform='translate(12.96,449.90) rotate(-90)' style='font-size: 12.00px; font-family: Liberation Sans;' textLength='46.70px' lengthAdjust='spacingAndGlyphs'>Residual</text></g>
-<defs>
-  <clipPath id='cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM='>
-    <rect x='59.04' y='350.53' width='630.72' height='152.03' />
-  </clipPath>
-</defs>
-<circle cx='82.40' cy='408.68' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='87.31' cy='446.01' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='97.12' cy='447.33' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='116.75' cy='392.86' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='151.11' cy='367.89' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='219.81' cy='381.45' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='391.58' cy='399.15' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='528.99' cy='399.83' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<circle cx='666.40' cy='422.44' r='2.70pt' style='stroke-width: 0.75;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<line x1='59.04' y1='426.55' x2='689.76' y2='426.55' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' clip-path='url(#cpNTkuMDR8Njg5Ljc2fDUwMi41NnwzNTAuNTM=)' />
-<defs>
-  <clipPath id='cpNTkuMDR8Njg5Ljc2fDUwMi41Nnw1OS4wNA=='>
-    <rect x='59.04' y='59.04' width='630.72' height='443.52' />
-  </clipPath>
-</defs>
-</svg>