Finish adapting to upcoming deSolve

1 files changed, 27 insertions, 65 deletions

diff --git a/vignettes/web_only/benchmarks.html b/vignettes/web_only/benchmarks.html
index fb799462..6cce41e6 100644
--- a/vignettes/web_only/benchmarks.html
+++ b/vignettes/web_only/benchmarks.html
@@ -1592,7 +1592,7 @@ div.tocify {
 
 <h1 class="title toc-ignore">Benchmark timings for mkin</h1>
 <h4 class="author">Johannes Ranke</h4>
-<h4 class="date">Last change 14 July 2022 (rebuilt 2023-02-13)</h4>
+<h4 class="date">Last change 14 July 2022 (rebuilt 2023-02-17)</h4>
 
 </div>
 
@@ -1636,31 +1636,11 @@ FOMC_SFO &lt;- mkinmod(
 DFOP_SFO &lt;- mkinmod(
   parent = mkinsub(&quot;FOMC&quot;, &quot;m1&quot;), # erroneously used FOMC twice, not fixed for consistency
   m1 = mkinsub(&quot;SFO&quot;))
-t3 &lt;- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D)))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
-<pre class="r"><code>t4 &lt;- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D),
-    error_model = &quot;tc&quot;))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
-<pre class="r"><code>t5 &lt;- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D),
+t3 &lt;- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D)))[[&quot;elapsed&quot;]]
+t4 &lt;- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D),
+    error_model = &quot;tc&quot;))[[&quot;elapsed&quot;]]
+t5 &lt;- system.time(mmkin_bench(list(SFO_SFO, FOMC_SFO, DFOP_SFO), list(FOCUS_D),
     error_model = &quot;obs&quot;))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
 <p>Two metabolites, synthetic data:</p>
 <pre class="r"><code>m_synth_SFO_lin &lt;- mkinmod(parent = mkinsub(&quot;SFO&quot;, &quot;M1&quot;),
                            M1 = mkinsub(&quot;SFO&quot;, &quot;M2&quot;),
@@ -1676,36 +1656,18 @@ SFO_lin_a &lt;- synthetic_data_for_UBA_2014[[1]]$data
 
 DFOP_par_c &lt;- synthetic_data_for_UBA_2014[[12]]$data
 
-t6 &lt;- system.time(mmkin_bench(list(m_synth_SFO_lin), list(SFO_lin_a)))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
-<pre class="r"><code>t7 &lt;- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c)))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
-<pre class="r"><code>t8 &lt;- system.time(mmkin_bench(list(m_synth_SFO_lin), list(SFO_lin_a),
-    error_model = &quot;tc&quot;))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
-<pre class="r"><code>t9 &lt;- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c),
-    error_model = &quot;tc&quot;))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
-<pre class="r"><code>t10 &lt;- system.time(mmkin_bench(list(m_synth_SFO_lin), list(SFO_lin_a),
-    error_model = &quot;obs&quot;))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
-<pre class="r"><code>t11 &lt;- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c),
+t6 &lt;- system.time(mmkin_bench(list(m_synth_SFO_lin), list(SFO_lin_a)))[[&quot;elapsed&quot;]]
+t7 &lt;- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c)))[[&quot;elapsed&quot;]]
+
+t8 &lt;- system.time(mmkin_bench(list(m_synth_SFO_lin), list(SFO_lin_a),
+    error_model = &quot;tc&quot;))[[&quot;elapsed&quot;]]
+t9 &lt;- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c),
+    error_model = &quot;tc&quot;))[[&quot;elapsed&quot;]]
+
+t10 &lt;- system.time(mmkin_bench(list(m_synth_SFO_lin), list(SFO_lin_a),
+    error_model = &quot;obs&quot;))[[&quot;elapsed&quot;]]
+t11 &lt;- system.time(mmkin_bench(list(m_synth_DFOP_par), list(DFOP_par_c),
     error_model = &quot;obs&quot;))[[&quot;elapsed&quot;]]</code></pre>
-<pre><code>## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable
-## Error in mkinmod[[&quot;symbols&quot;]] : 
-##   object of type &#39;closure&#39; is not subsettable</code></pre>
 </div>
 <div id="results" class="section level2">
 <h2>Results</h2>
@@ -1901,8 +1863,8 @@ models fitted to two datasets, i.e. eight fits for each test.</p>
 <td align="left">Ryzen 9 7950X 16-Core Processor</td>
 <td align="left">4.2.2</td>
 <td align="left">1.3.0</td>
-<td align="right">1.271</td>
-<td align="right">1.787</td>
+<td align="right">1.287</td>
+<td align="right">1.805</td>
 </tr>
 </tbody>
 </table>
@@ -2119,9 +2081,9 @@ for each test.</p>
 <td align="left">Ryzen 9 7950X 16-Core Processor</td>
 <td align="left">4.2.2</td>
 <td align="left">1.3.0</td>
-<td align="right">0.526</td>
-<td align="right">0.623</td>
-<td align="right">0.631</td>
+<td align="right">0.731</td>
+<td align="right">1.984</td>
+<td align="right">1.100</td>
 </tr>
 </tbody>
 </table>
@@ -2404,12 +2366,12 @@ dataset, i.e. one fit for each test.</p>
 <td align="left">Ryzen 9 7950X 16-Core Processor</td>
 <td align="left">4.2.2</td>
 <td align="left">1.3.0</td>
-<td align="right">0.242</td>
-<td align="right">0.237</td>
-<td align="right">0.238</td>
-<td align="right">0.239</td>
-<td align="right">0.237</td>
-<td align="right">0.237</td>
+<td align="right">0.400</td>
+<td align="right">0.518</td>
+<td align="right">0.580</td>
+<td align="right">0.990</td>
+<td align="right">0.701</td>
+<td align="right">0.935</td>
 </tr>
 </tbody>
 </table>