From 21ad91256dc29423bd905de5c298fd23862b1f3b Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Mon, 14 Nov 2022 20:03:42 +0100
Subject: Automatic starting parameters for saem.mmkin

For the case of mkin transformations. This gives faster convergence,
and appears to avoid problems with numeric ODE solutions
---
 .../multistart/llhist-for-biphasic-saemix-fit.svg  |  41 ++--
 .../multistart/parplot-for-biphasic-saemix-fit.svg | 242 +++++++++++----------
 2 files changed, 146 insertions(+), 137 deletions(-)

(limited to 'tests/testthat/_snaps/multistart')

diff --git a/tests/testthat/_snaps/multistart/llhist-for-biphasic-saemix-fit.svg b/tests/testthat/_snaps/multistart/llhist-for-biphasic-saemix-fit.svg
index fe38865d..6015aed8 100644
--- a/tests/testthat/_snaps/multistart/llhist-for-biphasic-saemix-fit.svg
+++ b/tests/testthat/_snaps/multistart/llhist-for-biphasic-saemix-fit.svg
@@ -21,24 +21,28 @@
 <text transform='translate(12.96,280.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='148.77px' lengthAdjust='spacingAndGlyphs'>Frequency of log likelihoods</text>
 <line x1='82.40' y1='502.56' x2='666.40' 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='228.40' y1='502.56' x2='228.40' y2='509.76' style='stroke-width: 0.75;' />
-<line x1='374.40' y1='502.56' x2='374.40' y2='509.76' style='stroke-width: 0.75;' />
-<line x1='520.40' y1='502.56' x2='520.40' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='199.20' y1='502.56' x2='199.20' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='316.00' y1='502.56' x2='316.00' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='432.80' y1='502.56' x2='432.80' y2='509.76' style='stroke-width: 0.75;' />
+<line x1='549.60' y1='502.56' x2='549.60' y2='509.76' style='stroke-width: 0.75;' />
 <line x1='666.40' y1='502.56' x2='666.40' 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='30.69px' lengthAdjust='spacingAndGlyphs'>-1185</text>
-<text x='228.40' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='30.69px' lengthAdjust='spacingAndGlyphs'>-1180</text>
-<text x='374.40' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='30.69px' lengthAdjust='spacingAndGlyphs'>-1175</text>
-<text x='520.40' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='30.69px' lengthAdjust='spacingAndGlyphs'>-1170</text>
-<text x='666.40' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='30.69px' lengthAdjust='spacingAndGlyphs'>-1165</text>
+<text x='82.40' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='40.70px' lengthAdjust='spacingAndGlyphs'>-1149.5</text>
+<text x='199.20' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='40.70px' lengthAdjust='spacingAndGlyphs'>-1149.4</text>
+<text x='316.00' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='40.70px' lengthAdjust='spacingAndGlyphs'>-1149.3</text>
+<text x='432.80' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='40.70px' lengthAdjust='spacingAndGlyphs'>-1149.2</text>
+<text x='549.60' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='40.70px' lengthAdjust='spacingAndGlyphs'>-1149.1</text>
+<text x='666.40' y='528.48' text-anchor='middle' style='font-size: 12.00px; font-family: sans;' textLength='40.70px' lengthAdjust='spacingAndGlyphs'>-1149.0</text>
 <line x1='59.04' y1='486.13' x2='59.04' y2='75.47' 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='349.24' x2='51.84' y2='349.24' style='stroke-width: 0.75;' />
-<line x1='59.04' y1='212.36' x2='51.84' y2='212.36' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='383.47' x2='51.84' y2='383.47' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='280.80' x2='51.84' y2='280.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='178.13' x2='51.84' y2='178.13' style='stroke-width: 0.75;' />
 <line x1='59.04' y1='75.47' x2='51.84' y2='75.47' style='stroke-width: 0.75;' />
 <text x='44.64' y='490.26' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
-<text x='44.64' y='353.37' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>1</text>
-<text x='44.64' y='216.48' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
-<text x='44.64' y='79.60' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='44.64' y='387.60' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>1</text>
+<text x='44.64' y='284.93' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text x='44.64' y='182.26' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='44.64' y='79.60' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
 </g>
 <defs>
   <clipPath id='cpNTkuMDR8Njg5Ljc2fDU5LjA0fDUwMi41Ng=='>
@@ -46,11 +50,12 @@
   </clipPath>
 </defs>
 <g clip-path='url(#cpNTkuMDR8Njg5Ljc2fDU5LjA0fDUwMi41Ng==)'>
-<rect x='82.40' y='349.24' width='146.00' height='136.89' style='stroke-width: 0.75; fill: #D3D3D3;' />
-<rect x='228.40' y='75.47' width='146.00' height='410.67' style='stroke-width: 0.75; fill: #D3D3D3;' />
-<rect x='374.40' y='212.36' width='146.00' height='273.78' style='stroke-width: 0.75; fill: #D3D3D3;' />
-<rect x='520.40' y='212.36' width='146.00' height='273.78' style='stroke-width: 0.75; fill: #D3D3D3;' />
-<line x1='352.00' y1='502.56' x2='352.00' y2='59.04' style='stroke-width: 0.75; stroke: #DF536B;' />
+<rect x='82.40' y='383.47' width='116.80' height='102.67' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='199.20' y='486.13' width='116.80' height='0.00' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='316.00' y='486.13' width='116.80' height='0.00' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='432.80' y='178.13' width='116.80' height='308.00' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='549.60' y='75.47' width='116.80' height='410.67' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<line x1='624.24' y1='502.56' x2='624.24' y2='59.04' style='stroke-width: 0.75; stroke: #DF536B;' />
 <line x1='101.38' y1='95.62' x2='122.98' y2='95.62' style='stroke-width: 0.75; stroke: #DF536B;' />
 <text x='133.78' y='99.75' style='font-size: 12.00px; font-family: sans;' textLength='51.35px' lengthAdjust='spacingAndGlyphs'>original fit</text>
 </g>
diff --git a/tests/testthat/_snaps/multistart/parplot-for-biphasic-saemix-fit.svg b/tests/testthat/_snaps/multistart/parplot-for-biphasic-saemix-fit.svg
index 75519b07..c0332fd5 100644
--- a/tests/testthat/_snaps/multistart/parplot-for-biphasic-saemix-fit.svg
+++ b/tests/testthat/_snaps/multistart/parplot-for-biphasic-saemix-fit.svg
@@ -25,105 +25,109 @@
   </clipPath>
 </defs>
 <g clip-path='url(#cpNTkuMDR8Njg5Ljc2fDU5LjA0fDUwMi41Ng==)'>
-<polygon points='86.57,281.86 119.94,281.86 119.94,281.05 86.57,281.05 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='86.57' y1='281.40' x2='119.94' y2='281.40' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='103.26' y1='282.61' x2='103.26' y2='281.86' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='103.26' y1='280.53' x2='103.26' y2='281.05' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='94.91' y1='282.61' x2='111.60' y2='282.61' style='stroke-width: 0.75;' />
-<line x1='94.91' y1='280.53' x2='111.60' y2='280.53' style='stroke-width: 0.75;' />
-<polygon points='86.57,281.86 119.94,281.86 119.94,281.05 86.57,281.05 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='128.29,281.09 161.66,281.09 161.66,279.88 128.29,279.88 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='128.29' y1='280.70' x2='161.66' y2='280.70' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='144.97' y1='281.58' x2='144.97' y2='281.09' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='144.97' y1='278.61' x2='144.97' y2='279.88' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='136.63' y1='281.58' x2='153.31' y2='281.58' style='stroke-width: 0.75;' />
-<line x1='136.63' y1='278.61' x2='153.31' y2='278.61' style='stroke-width: 0.75;' />
-<polygon points='128.29,281.09 161.66,281.09 161.66,279.88 128.29,279.88 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='170.00,280.59 203.37,280.59 203.37,279.25 170.00,279.25 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='170.00' y1='279.93' x2='203.37' y2='279.93' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='186.69' y1='281.41' x2='186.69' y2='280.59' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='186.69' y1='277.80' x2='186.69' y2='279.25' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='178.34' y1='281.41' x2='195.03' y2='281.41' style='stroke-width: 0.75;' />
-<line x1='178.34' y1='277.80' x2='195.03' y2='277.80' style='stroke-width: 0.75;' />
-<polygon points='170.00,280.59 203.37,280.59 203.37,279.25 170.00,279.25 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='211.71,390.81 245.09,390.81 245.09,314.11 211.71,314.11 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='211.71' y1='349.06' x2='245.09' y2='349.06' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='228.40' y1='466.84' x2='228.40' y2='390.81' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='228.40' y1='280.80' x2='228.40' y2='314.11' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='220.06' y1='466.84' x2='236.74' y2='466.84' style='stroke-width: 0.75;' />
-<line x1='220.06' y1='280.80' x2='236.74' y2='280.80' style='stroke-width: 0.75;' />
-<polygon points='211.71,390.81 245.09,390.81 245.09,314.11 211.71,314.11 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='253.43,253.88 286.80,253.88 286.80,176.67 253.43,176.67 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='253.43' y1='218.41' x2='286.80' y2='218.41' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='270.11' y1='280.80' x2='270.11' y2='253.88' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='270.11' y1='99.85' x2='270.11' y2='176.67' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='261.77' y1='280.80' x2='278.46' y2='280.80' style='stroke-width: 0.75;' />
-<line x1='261.77' y1='99.85' x2='278.46' y2='99.85' style='stroke-width: 0.75;' />
-<polygon points='253.43,253.88 286.80,253.88 286.80,176.67 253.43,176.67 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='295.14,281.21 328.51,281.21 328.51,279.04 295.14,279.04 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='295.14' y1='279.74' x2='328.51' y2='279.74' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='311.83' y1='282.98' x2='311.83' y2='281.21' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='311.83' y1='278.86' x2='311.83' y2='279.04' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='303.49' y1='282.98' x2='320.17' y2='282.98' style='stroke-width: 0.75;' />
-<line x1='303.49' y1='278.86' x2='320.17' y2='278.86' style='stroke-width: 0.75;' />
-<polygon points='295.14,281.21 328.51,281.21 328.51,279.04 295.14,279.04 ' style='stroke-width: 0.75; fill: none;' />
-<circle cx='311.83' cy='273.78' r='2.70' style='stroke-width: 0.75;' />
-<polygon points='336.86,281.16 370.23,281.16 370.23,276.59 336.86,276.59 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='336.86' y1='280.72' x2='370.23' y2='280.72' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='353.54' y1='281.57' x2='353.54' y2='281.16' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='353.54' y1='273.84' x2='353.54' y2='276.59' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='345.20' y1='281.57' x2='361.89' y2='281.57' style='stroke-width: 0.75;' />
-<line x1='345.20' y1='273.84' x2='361.89' y2='273.84' style='stroke-width: 0.75;' />
-<polygon points='336.86,281.16 370.23,281.16 370.23,276.59 336.86,276.59 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='378.57,280.71 411.94,280.71 411.94,279.76 378.57,279.76 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='378.57' y1='280.43' x2='411.94' y2='280.43' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='395.26' y1='281.04' x2='395.26' y2='280.71' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='395.26' y1='279.09' x2='395.26' y2='279.76' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='386.91' y1='281.04' x2='403.60' y2='281.04' style='stroke-width: 0.75;' />
-<line x1='386.91' y1='279.09' x2='403.60' y2='279.09' style='stroke-width: 0.75;' />
-<polygon points='378.57,280.71 411.94,280.71 411.94,279.76 378.57,279.76 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='420.29,367.01 453.66,367.01 453.66,255.90 420.29,255.90 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='420.29' y1='271.64' x2='453.66' y2='271.64' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='436.97' y1='435.38' x2='436.97' y2='367.01' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='436.97' y1='251.19' x2='436.97' y2='255.90' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='428.63' y1='435.38' x2='445.31' y2='435.38' style='stroke-width: 0.75;' />
-<line x1='428.63' y1='251.19' x2='445.31' y2='251.19' style='stroke-width: 0.75;' />
-<polygon points='420.29,367.01 453.66,367.01 453.66,255.90 420.29,255.90 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='462.00,287.51 495.37,287.51 495.37,281.36 462.00,281.36 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='462.00' y1='285.66' x2='495.37' y2='285.66' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='478.69' y1='288.72' x2='478.69' y2='287.51' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='478.69' y1='279.39' x2='478.69' y2='281.36' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='470.34' y1='288.72' x2='487.03' y2='288.72' style='stroke-width: 0.75;' />
-<line x1='470.34' y1='279.39' x2='487.03' y2='279.39' style='stroke-width: 0.75;' />
-<polygon points='462.00,287.51 495.37,287.51 495.37,281.36 462.00,281.36 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='503.71,282.82 537.09,282.82 537.09,280.27 503.71,280.27 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='503.71' y1='281.73' x2='537.09' y2='281.73' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='520.40' y1='283.42' x2='520.40' y2='282.82' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='520.40' y1='278.60' x2='520.40' y2='280.27' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='512.06' y1='283.42' x2='528.74' y2='283.42' style='stroke-width: 0.75;' />
-<line x1='512.06' y1='278.60' x2='528.74' y2='278.60' style='stroke-width: 0.75;' />
-<polygon points='503.71,282.82 537.09,282.82 537.09,280.27 503.71,280.27 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='545.43,248.94 578.80,248.94 578.80,224.38 545.43,224.38 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='545.43' y1='238.69' x2='578.80' y2='238.69' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='562.11' y1='280.80' x2='562.11' y2='248.94' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='562.11' y1='212.81' x2='562.11' y2='224.38' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='553.77' y1='280.80' x2='570.46' y2='280.80' style='stroke-width: 0.75;' />
-<line x1='553.77' y1='212.81' x2='570.46' y2='212.81' style='stroke-width: 0.75;' />
-<polygon points='545.43,248.94 578.80,248.94 578.80,224.38 545.43,224.38 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='587.14,261.50 620.51,261.50 620.51,214.29 587.14,214.29 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='587.14' y1='231.46' x2='620.51' y2='231.46' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='603.83' y1='280.80' x2='603.83' y2='261.50' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='603.83' y1='198.75' x2='603.83' y2='214.29' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='595.49' y1='280.80' x2='612.17' y2='280.80' style='stroke-width: 0.75;' />
-<line x1='595.49' y1='198.75' x2='612.17' y2='198.75' style='stroke-width: 0.75;' />
-<polygon points='587.14,261.50 620.51,261.50 620.51,214.29 587.14,214.29 ' style='stroke-width: 0.75; fill: none;' />
-<polygon points='628.86,362.57 662.23,362.57 662.23,266.09 628.86,266.09 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
-<line x1='628.86' y1='298.49' x2='662.23' y2='298.49' style='stroke-width: 2.25; stroke-linecap: butt;' />
-<line x1='645.54' y1='471.48' x2='645.54' y2='362.57' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='645.54' y1='263.75' x2='645.54' y2='266.09' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
-<line x1='637.20' y1='471.48' x2='653.89' y2='471.48' style='stroke-width: 0.75;' />
-<line x1='637.20' y1='263.75' x2='653.89' y2='263.75' style='stroke-width: 0.75;' />
-<polygon points='628.86,362.57 662.23,362.57 662.23,266.09 628.86,266.09 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='86.57,280.95 119.94,280.95 119.94,280.68 86.57,280.68 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='86.57' y1='280.78' x2='119.94' y2='280.78' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='103.26' y1='281.01' x2='103.26' y2='280.95' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='103.26' y1='280.63' x2='103.26' y2='280.68' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='94.91' y1='281.01' x2='111.60' y2='281.01' style='stroke-width: 0.75;' />
+<line x1='94.91' y1='280.63' x2='111.60' y2='280.63' style='stroke-width: 0.75;' />
+<polygon points='86.57,280.95 119.94,280.95 119.94,280.68 86.57,280.68 ' style='stroke-width: 0.75; fill: none;' />
+<circle cx='103.26' cy='281.66' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='103.26' cy='279.89' r='2.70' style='stroke-width: 0.75;' />
+<polygon points='128.29,282.46 161.66,282.46 161.66,280.33 128.29,280.33 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='128.29' y1='280.88' x2='161.66' y2='280.88' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='144.97' y1='282.96' x2='144.97' y2='282.46' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='144.97' y1='279.72' x2='144.97' y2='280.33' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='136.63' y1='282.96' x2='153.31' y2='282.96' style='stroke-width: 0.75;' />
+<line x1='136.63' y1='279.72' x2='153.31' y2='279.72' style='stroke-width: 0.75;' />
+<polygon points='128.29,282.46 161.66,282.46 161.66,280.33 128.29,280.33 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='170.00,281.20 203.37,281.20 203.37,280.53 170.00,280.53 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='170.00' y1='280.84' x2='203.37' y2='280.84' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='186.69' y1='281.48' x2='186.69' y2='281.20' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='186.69' y1='280.35' x2='186.69' y2='280.53' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='178.34' y1='281.48' x2='195.03' y2='281.48' style='stroke-width: 0.75;' />
+<line x1='178.34' y1='280.35' x2='195.03' y2='280.35' style='stroke-width: 0.75;' />
+<polygon points='170.00,281.20 203.37,281.20 203.37,280.53 170.00,280.53 ' style='stroke-width: 0.75; fill: none;' />
+<circle cx='186.69' cy='279.30' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='186.69' cy='282.58' r='2.70' style='stroke-width: 0.75;' />
+<polygon points='211.71,281.98 245.09,281.98 245.09,280.03 211.71,280.03 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='211.71' y1='281.46' x2='245.09' y2='281.46' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='228.40' y1='282.40' x2='228.40' y2='281.98' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='228.40' y1='279.21' x2='228.40' y2='280.03' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='220.06' y1='282.40' x2='236.74' y2='282.40' style='stroke-width: 0.75;' />
+<line x1='220.06' y1='279.21' x2='236.74' y2='279.21' style='stroke-width: 0.75;' />
+<polygon points='211.71,281.98 245.09,281.98 245.09,280.03 211.71,280.03 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='253.43,281.94 286.80,281.94 286.80,280.63 253.43,280.63 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='253.43' y1='281.42' x2='286.80' y2='281.42' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='270.11' y1='282.62' x2='270.11' y2='281.94' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='270.11' y1='280.34' x2='270.11' y2='280.63' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='261.77' y1='282.62' x2='278.46' y2='282.62' style='stroke-width: 0.75;' />
+<line x1='261.77' y1='280.34' x2='278.46' y2='280.34' style='stroke-width: 0.75;' />
+<polygon points='253.43,281.94 286.80,281.94 286.80,280.63 253.43,280.63 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='295.14,281.17 328.51,281.17 328.51,278.99 295.14,278.99 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='295.14' y1='280.18' x2='328.51' y2='280.18' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='311.83' y1='282.20' x2='311.83' y2='281.17' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='311.83' y1='277.75' x2='311.83' y2='278.99' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='303.49' y1='282.20' x2='320.17' y2='282.20' style='stroke-width: 0.75;' />
+<line x1='303.49' y1='277.75' x2='320.17' y2='277.75' style='stroke-width: 0.75;' />
+<polygon points='295.14,281.17 328.51,281.17 328.51,278.99 295.14,278.99 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='336.86,281.95 370.23,281.95 370.23,281.00 336.86,281.00 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='336.86' y1='281.48' x2='370.23' y2='281.48' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='353.54' y1='282.69' x2='353.54' y2='281.95' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='353.54' y1='280.80' x2='353.54' y2='281.00' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='345.20' y1='282.69' x2='361.89' y2='282.69' style='stroke-width: 0.75;' />
+<line x1='345.20' y1='280.80' x2='361.89' y2='280.80' style='stroke-width: 0.75;' />
+<polygon points='336.86,281.95 370.23,281.95 370.23,281.00 336.86,281.00 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='378.57,280.93 411.94,280.93 411.94,280.50 378.57,280.50 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='378.57' y1='280.72' x2='411.94' y2='280.72' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='395.26' y1='281.09' x2='395.26' y2='280.93' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='395.26' y1='280.44' x2='395.26' y2='280.50' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='386.91' y1='281.09' x2='403.60' y2='281.09' style='stroke-width: 0.75;' />
+<line x1='386.91' y1='280.44' x2='403.60' y2='280.44' style='stroke-width: 0.75;' />
+<polygon points='378.57,280.93 411.94,280.93 411.94,280.50 378.57,280.50 ' style='stroke-width: 0.75; fill: none;' />
+<circle cx='395.26' cy='279.72' r='2.70' style='stroke-width: 0.75;' />
+<polygon points='420.29,409.00 453.66,409.00 453.66,-49.57 420.29,-49.57 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='420.29' y1='94.54' x2='453.66' y2='94.54' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='436.97' y1='656.81' x2='436.97' y2='409.00' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='436.97' y1='-136.13' x2='436.97' y2='-49.57' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='428.63' y1='656.81' x2='445.31' y2='656.81' style='stroke-width: 0.75;' />
+<line x1='428.63' y1='-136.13' x2='445.31' y2='-136.13' style='stroke-width: 0.75;' />
+<polygon points='420.29,409.00 453.66,409.00 453.66,-49.57 420.29,-49.57 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='462.00,280.54 495.37,280.54 495.37,275.74 462.00,275.74 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='462.00' y1='278.14' x2='495.37' y2='278.14' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='478.69' y1='281.75' x2='478.69' y2='280.54' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='478.69' y1='272.26' x2='478.69' y2='275.74' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='470.34' y1='281.75' x2='487.03' y2='281.75' style='stroke-width: 0.75;' />
+<line x1='470.34' y1='272.26' x2='487.03' y2='272.26' style='stroke-width: 0.75;' />
+<polygon points='462.00,280.54 495.37,280.54 495.37,275.74 462.00,275.74 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='503.71,282.63 537.09,282.63 537.09,280.69 503.71,280.69 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='503.71' y1='282.10' x2='537.09' y2='282.10' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='520.40' y1='283.13' x2='520.40' y2='282.63' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='520.40' y1='280.04' x2='520.40' y2='280.69' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='512.06' y1='283.13' x2='528.74' y2='283.13' style='stroke-width: 0.75;' />
+<line x1='512.06' y1='280.04' x2='528.74' y2='280.04' style='stroke-width: 0.75;' />
+<polygon points='503.71,282.63 537.09,282.63 537.09,280.69 503.71,280.69 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='545.43,283.04 578.80,283.04 578.80,278.99 545.43,278.99 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='545.43' y1='281.15' x2='578.80' y2='281.15' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='562.11' y1='283.53' x2='562.11' y2='283.04' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='562.11' y1='275.97' x2='562.11' y2='278.99' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='553.77' y1='283.53' x2='570.46' y2='283.53' style='stroke-width: 0.75;' />
+<line x1='553.77' y1='275.97' x2='570.46' y2='275.97' style='stroke-width: 0.75;' />
+<polygon points='545.43,283.04 578.80,283.04 578.80,278.99 545.43,278.99 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='587.14,284.59 620.51,284.59 620.51,281.02 587.14,281.02 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='587.14' y1='282.38' x2='620.51' y2='282.38' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='603.83' y1='288.19' x2='603.83' y2='284.59' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='603.83' y1='279.95' x2='603.83' y2='281.02' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='595.49' y1='288.19' x2='612.17' y2='288.19' style='stroke-width: 0.75;' />
+<line x1='595.49' y1='279.95' x2='612.17' y2='279.95' style='stroke-width: 0.75;' />
+<polygon points='587.14,284.59 620.51,284.59 620.51,281.02 587.14,281.02 ' style='stroke-width: 0.75; fill: none;' />
+<polygon points='628.86,292.70 662.23,292.70 662.23,264.27 628.86,264.27 ' style='stroke-width: 0.75; stroke: none; fill: #D3D3D3;' />
+<line x1='628.86' y1='282.03' x2='662.23' y2='282.03' style='stroke-width: 2.25; stroke-linecap: butt;' />
+<line x1='645.54' y1='297.26' x2='645.54' y2='292.70' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='645.54' y1='258.13' x2='645.54' y2='264.27' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
+<line x1='637.20' y1='297.26' x2='653.89' y2='297.26' style='stroke-width: 0.75;' />
+<line x1='637.20' y1='258.13' x2='653.89' y2='258.13' style='stroke-width: 0.75;' />
+<polygon points='628.86,292.70 662.23,292.70 662.23,264.27 628.86,264.27 ' style='stroke-width: 0.75; fill: none;' />
 </g>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
 <line x1='103.26' y1='502.56' x2='645.54' y2='502.56' style='stroke-width: 0.75;' />
@@ -163,26 +167,26 @@
 <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;' />
 </g>
 <g clip-path='url(#cpNTkuMDR8Njg5Ljc2fDU5LjA0fDUwMi41Ng==)'>
-<circle cx='103.26' cy='280.53' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
-<circle cx='144.97' cy='286.34' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
-<circle cx='186.69' cy='282.29' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
-<circle cx='228.40' cy='183.59' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
-<circle cx='270.11' cy='371.54' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
-<circle cx='311.83' cy='283.45' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
-<circle cx='103.26' cy='281.23' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='144.97' cy='282.41' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='186.69' cy='280.87' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='228.40' cy='354.47' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='270.11' cy='213.94' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='311.83' cy='272.62' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='353.54' cy='280.56' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='395.26' cy='280.72' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='436.97' cy='325.61' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='478.69' cy='285.95' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='520.40' cy='277.95' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='562.11' cy='241.50' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='603.83' cy='216.61' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
-<circle cx='645.54' cy='302.30' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='103.26' cy='279.64' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
+<circle cx='144.97' cy='286.44' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
+<circle cx='186.69' cy='283.22' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
+<circle cx='228.40' cy='269.36' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
+<circle cx='270.11' cy='283.47' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
+<circle cx='311.83' cy='285.42' r='8.10' style='stroke-width: 0.75; stroke: #61D04F;' />
+<circle cx='103.26' cy='280.60' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='144.97' cy='281.94' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='186.69' cy='281.42' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='228.40' cy='283.69' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='270.11' cy='282.86' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='311.83' cy='277.19' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='353.54' cy='280.74' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='395.26' cy='281.31' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='436.97' cy='-50.55' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='478.69' cy='282.91' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='520.40' cy='281.35' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='562.11' cy='277.34' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='603.83' cy='281.94' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
+<circle cx='645.54' cy='296.99' r='5.40' style='stroke-width: 0.75; stroke: #DF536B;' />
 <line x1='59.04' y1='280.80' x2='689.76' y2='280.80' style='stroke-width: 0.75; stroke-dasharray: 4.00,4.00;' />
 <line x1='93.82' y1='465.98' x2='115.42' y2='465.98' style='stroke-width: 0.75;' />
 <circle cx='104.62' cy='437.18' r='2.70' style='stroke-width: 0.75; stroke: #61D04F;' />
-- 
cgit v1.2.1