aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile4
-rw-r--r--docs/articles/FOCUS_L.html42
-rw-r--r--docs/articles/web_only/compiled_models.html10
-rw-r--r--docs/reference/Extract.mmkin.html12
-rw-r--r--docs/reference/mccall81_245T.html12
-rw-r--r--docs/reference/mkinfit.html46
-rw-r--r--docs/reference/mkinmod.html2
-rw-r--r--docs/reference/mkinpredict.html2
-rw-r--r--docs/reference/mmkin.html4
-rw-r--r--docs/reference/summary.mkinfit.html6
-rw-r--r--docs/reference/transform_odeparms.html24
-rw-r--r--test.log18
-rw-r--r--tests/testthat/test_FOCUS_chi2_error_level.R3
-rw-r--r--tests/testthat/test_parent_only.R4
-rw-r--r--tests/testthat/test_twa.R6
15 files changed, 96 insertions, 99 deletions
diff --git a/GNUmakefile b/GNUmakefile
index a6f0d8c6..20a9c723 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -63,8 +63,8 @@ clean:
$(RM) -r vignettes/web_only/*.R
$(RM) Rplots.pdf
-test: quickinstall
- NOT_CRAN=true "$(RBIN)/Rscript" -e 'devtools::test()' 2>&1 | tee test.log
+test: install
+ "$(RBIN)/Rscript" -e 'devtools::test()' 2>&1 | tee test.log
README.html: README.md
"$(RBIN)/Rscript" -e "rmarkdown::render('README.md', output_format = 'html_document', output_options = list(mathjax = NULL))"
diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html
index 8b06f072..f1a91c04 100644
--- a/docs/articles/FOCUS_L.html
+++ b/docs/articles/FOCUS_L.html
@@ -110,15 +110,15 @@
<a class="sourceLine" id="cb2-2" data-line-number="2"><span class="kw">summary</span>(m.L1.SFO)</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.47.5
## R version used for fitting: 3.5.1
-## Date of fit: Fri Sep 14 17:43:07 2018
-## Date of summary: Fri Sep 14 17:43:07 2018
+## Date of fit: Fri Sep 14 18:22:23 2018
+## Date of summary: Fri Sep 14 18:22:23 2018
##
## Equations:
## d_parent/dt = - k_parent_sink * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 37 model solutions performed in 0.091 s
+## Fitted with method Port using 37 model solutions performed in 0.092 s
##
## Weighting: none
##
@@ -201,15 +201,15 @@
<div class="sourceCode" id="cb7"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb7-1" data-line-number="1"><span class="kw">summary</span>(m.L1.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.47.5
## R version used for fitting: 3.5.1
-## Date of fit: Fri Sep 14 17:43:09 2018
-## Date of summary: Fri Sep 14 17:43:09 2018
+## Date of fit: Fri Sep 14 18:22:25 2018
+## Date of summary: Fri Sep 14 18:22:25 2018
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 611 model solutions performed in 1.398 s
+## Fitted with method Port using 611 model solutions performed in 1.355 s
##
## Weighting: none
##
@@ -296,15 +296,15 @@
<div class="sourceCode" id="cb12"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb12-1" data-line-number="1"><span class="kw">summary</span>(m.L2.FOMC, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.47.5
## R version used for fitting: 3.5.1
-## Date of fit: Fri Sep 14 17:43:10 2018
-## Date of summary: Fri Sep 14 17:43:10 2018
+## Date of fit: Fri Sep 14 18:22:25 2018
+## Date of summary: Fri Sep 14 18:22:25 2018
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 81 model solutions performed in 0.18 s
+## Fitted with method Port using 81 model solutions performed in 0.175 s
##
## Weighting: none
##
@@ -367,8 +367,8 @@
<div class="sourceCode" id="cb15"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb15-1" data-line-number="1"><span class="kw">summary</span>(m.L2.DFOP, <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.47.5
## R version used for fitting: 3.5.1
-## Date of fit: Fri Sep 14 17:43:11 2018
-## Date of summary: Fri Sep 14 17:43:11 2018
+## Date of fit: Fri Sep 14 18:22:26 2018
+## Date of summary: Fri Sep 14 18:22:26 2018
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -377,7 +377,7 @@
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 336 model solutions performed in 0.782 s
+## Fitted with method Port using 336 model solutions performed in 0.756 s
##
## Weighting: none
##
@@ -459,8 +459,8 @@
<div class="sourceCode" id="cb21"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb21-1" data-line-number="1"><span class="kw">summary</span>(mm.L3[[<span class="st">"DFOP"</span>, <span class="dv">1</span>]])</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.47.5
## R version used for fitting: 3.5.1
-## Date of fit: Fri Sep 14 17:43:12 2018
-## Date of summary: Fri Sep 14 17:43:12 2018
+## Date of fit: Fri Sep 14 18:22:27 2018
+## Date of summary: Fri Sep 14 18:22:28 2018
##
## Equations:
## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) *
@@ -469,7 +469,7 @@
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 137 model solutions performed in 0.312 s
+## Fitted with method Port using 137 model solutions performed in 0.322 s
##
## Weighting: none
##
@@ -560,15 +560,15 @@
<div class="sourceCode" id="cb26"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb26-1" data-line-number="1"><span class="kw">summary</span>(mm.L4[[<span class="st">"SFO"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.47.5
## R version used for fitting: 3.5.1
-## Date of fit: Fri Sep 14 17:43:12 2018
-## Date of summary: Fri Sep 14 17:43:12 2018
+## Date of fit: Fri Sep 14 18:22:28 2018
+## Date of summary: Fri Sep 14 18:22:28 2018
##
## Equations:
## d_parent/dt = - k_parent_sink * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 46 model solutions performed in 0.106 s
+## Fitted with method Port using 46 model solutions performed in 0.101 s
##
## Weighting: none
##
@@ -620,15 +620,15 @@
<div class="sourceCode" id="cb28"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb28-1" data-line-number="1"><span class="kw">summary</span>(mm.L4[[<span class="st">"FOMC"</span>, <span class="dv">1</span>]], <span class="dt">data =</span> <span class="ot">FALSE</span>)</a></code></pre></div>
<pre><code>## mkin version used for fitting: 0.9.47.5
## R version used for fitting: 3.5.1
-## Date of fit: Fri Sep 14 17:43:12 2018
-## Date of summary: Fri Sep 14 17:43:12 2018
+## Date of fit: Fri Sep 14 18:22:28 2018
+## Date of summary: Fri Sep 14 18:22:28 2018
##
## Equations:
## d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
##
## Model predictions using solution type analytical
##
-## Fitted with method Port using 66 model solutions performed in 0.15 s
+## Fitted with method Port using 66 model solutions performed in 0.16 s
##
## Weighting: none
##
diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html
index 0d91a50c..12c192f0 100644
--- a/docs/articles/web_only/compiled_models.html
+++ b/docs/articles/web_only/compiled_models.html
@@ -125,9 +125,9 @@
<a class="sourceLine" id="cb5-16" data-line-number="16">}</a></code></pre></div>
<pre><code>## Lade nötiges Paket: rbenchmark</code></pre>
<pre><code>## test replications elapsed relative user.self sys.self
-## 3 deSolve, compiled 3 2.174 1.000 2.172 0
-## 1 deSolve, not compiled 3 16.745 7.702 16.737 0
-## 2 Eigenvalue based 3 2.652 1.220 2.650 0
+## 3 deSolve, compiled 3 2.115 1.000 2.114 0
+## 1 deSolve, not compiled 3 16.235 7.676 16.228 0
+## 2 Eigenvalue based 3 2.589 1.224 2.587 0
## user.child sys.child
## 3 0 0
## 1 0 0
@@ -156,8 +156,8 @@
<a class="sourceLine" id="cb8-16" data-line-number="16">}</a></code></pre></div>
<pre><code>## Successfully compiled differential equation model from auto-generated C code.</code></pre>
<pre><code>## test replications elapsed relative user.self sys.self
-## 2 deSolve, compiled 3 4.012 1.000 4.010 0
-## 1 deSolve, not compiled 3 35.620 8.878 35.604 0
+## 2 deSolve, compiled 3 3.887 1.000 3.885 0
+## 1 deSolve, not compiled 3 35.492 9.131 35.474 0
## user.child sys.child
## 2 0 0
## 1 0 0</code></pre>
diff --git a/docs/reference/Extract.mmkin.html b/docs/reference/Extract.mmkin.html
index 8cf55860..91226e69 100644
--- a/docs/reference/Extract.mmkin.html
+++ b/docs/reference/Extract.mmkin.html
@@ -278,7 +278,7 @@
#&gt;
#&gt; $time
#&gt; User System verstrichen
-#&gt; 0.174 0.000 0.173
+#&gt; 0.166 0.000 0.166
#&gt;
#&gt; $mkinmod
#&gt; &lt;mkinmod&gt; model generated with
@@ -467,8 +467,8 @@
#&gt; }
#&gt; return(mC)
#&gt; }
-#&gt; &lt;bytecode: 0x55555bd78ed0&gt;
-#&gt; &lt;environment: 0x55555bc7eda8&gt;
+#&gt; &lt;bytecode: 0x55555bd812a0&gt;
+#&gt; &lt;environment: 0x55555bc871e8&gt;
#&gt;
#&gt; $cost_notrans
#&gt; function (P)
@@ -490,8 +490,8 @@
#&gt; scaleVar = scaleVar)
#&gt; return(mC)
#&gt; }
-#&gt; &lt;bytecode: 0x55555ca99e50&gt;
-#&gt; &lt;environment: 0x55555bc7eda8&gt;
+#&gt; &lt;bytecode: 0x55555caa1d18&gt;
+#&gt; &lt;environment: 0x55555bc871e8&gt;
#&gt;
#&gt; $hessian_notrans
#&gt; parent_0 k_parent_sink
@@ -558,7 +558,7 @@
#&gt; 99.17407
#&gt;
#&gt; $date
-#&gt; [1] "Fri Sep 14 17:41:26 2018"
+#&gt; [1] "Fri Sep 14 18:20:46 2018"
#&gt;
#&gt; $version
#&gt; [1] "0.9.47.5"
diff --git a/docs/reference/mccall81_245T.html b/docs/reference/mccall81_245T.html
index 902f1224..d91431f3 100644
--- a/docs/reference/mccall81_245T.html
+++ b/docs/reference/mccall81_245T.html
@@ -158,8 +158,8 @@
<span class='kw'>anisole</span> <span class='kw'>=</span> <span class='fu'>list</span>(<span class='kw'>type</span> <span class='kw'>=</span> <span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'> </div><div class='input'> <span class='no'>fit.1</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='no'>SFO_SFO_SFO</span>, <span class='fu'>subset</span>(<span class='no'>mccall81_245T</span>, <span class='no'>soil</span> <span class='kw'>==</span> <span class='st'>"Commerce"</span>), <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>fit.1</span>, <span class='kw'>data</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:38 2018
-#&gt; Date of summary: Fri Sep 14 17:41:38 2018
+#&gt; Date of fit: Fri Sep 14 18:20:57 2018
+#&gt; Date of summary: Fri Sep 14 18:20:57 2018
#&gt;
#&gt; Equations:
#&gt; d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245
@@ -169,7 +169,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 574 model solutions performed in 3.566 s
+#&gt; Fitted with method Port using 574 model solutions performed in 3.418 s
#&gt;
#&gt; Weighting: none
#&gt;
@@ -247,8 +247,8 @@
<span class='kw'>fixed_parms</span> <span class='kw'>=</span> <span class='st'>"k_phenol_sink"</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>fit.2</span>, <span class='kw'>data</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:39 2018
-#&gt; Date of summary: Fri Sep 14 17:41:40 2018
+#&gt; Date of fit: Fri Sep 14 18:20:59 2018
+#&gt; Date of summary: Fri Sep 14 18:20:59 2018
#&gt;
#&gt; Equations:
#&gt; d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245
@@ -258,7 +258,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 246 model solutions performed in 1.577 s
+#&gt; Fitted with method Port using 246 model solutions performed in 1.458 s
#&gt;
#&gt; Weighting: none
#&gt;
diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html
index 2d5ed97f..261d48fb 100644
--- a/docs/reference/mkinfit.html
+++ b/docs/reference/mkinfit.html
@@ -434,15 +434,15 @@
<span class='no'>fit</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='st'>"FOMC"</span>, <span class='no'>FOCUS_2006_C</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>fit</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:42 2018
-#&gt; Date of summary: Fri Sep 14 17:41:42 2018
+#&gt; Date of fit: Fri Sep 14 18:21:02 2018
+#&gt; Date of summary: Fri Sep 14 18:21:02 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent
#&gt;
#&gt; Model predictions using solution type analytical
#&gt;
-#&gt; Fitted with method Port using 64 model solutions performed in 0.153 s
+#&gt; Fitted with method Port using 64 model solutions performed in 0.143 s
#&gt;
#&gt; Weighting: none
#&gt;
@@ -511,7 +511,7 @@
<span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>))</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='co'># Fit the model to the FOCUS example dataset D using defaults</span>
<span class='fu'>print</span>(<span class='fu'>system.time</span>(<span class='no'>fit</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>SFO_SFO</span>, <span class='no'>FOCUS_2006_D</span>,
<span class='kw'>solution_type</span> <span class='kw'>=</span> <span class='st'>"eigen"</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)))</div><div class='output co'>#&gt; User System verstrichen
-#&gt; 0.946 0.000 0.947 </div><div class='input'><span class='fu'>coef</span>(<span class='no'>fit</span>)</div><div class='output co'>#&gt; parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink
+#&gt; 0.918 0.000 0.919 </div><div class='input'><span class='fu'>coef</span>(<span class='no'>fit</span>)</div><div class='output co'>#&gt; parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink
#&gt; 99.59848 -3.03822 -2.98030 -5.24750 </div><div class='input'><span class='fu'><a href='endpoints.html'>endpoints</a></span>(<span class='no'>fit</span>)</div><div class='output co'>#&gt; $ff
#&gt; parent_sink parent_m1 m1_sink
#&gt; 0.485524 0.514476 1.000000
@@ -586,7 +586,7 @@
#&gt; Model cost at call 146 : 371.2134
#&gt; Optimisation by method Port successfully terminated.
#&gt; User System verstrichen
-#&gt; 0.762 0.000 0.763 </div><div class='input'><span class='fu'>coef</span>(<span class='no'>fit.deSolve</span>)</div><div class='output co'>#&gt; parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink
+#&gt; 0.757 0.000 0.757 </div><div class='input'><span class='fu'>coef</span>(<span class='no'>fit.deSolve</span>)</div><div class='output co'>#&gt; parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink
#&gt; 99.59848 -3.03822 -2.98030 -5.24750 </div><div class='input'><span class='fu'><a href='endpoints.html'>endpoints</a></span>(<span class='no'>fit.deSolve</span>)</div><div class='output co'>#&gt; $ff
#&gt; parent_sink parent_m1 m1_sink
#&gt; 0.485524 0.514476 1.000000
@@ -624,8 +624,8 @@
<span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>), <span class='kw'>use_of_ff</span> <span class='kw'>=</span> <span class='st'>"max"</span>)</div><div class='output co'>#&gt; <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'><span class='no'>f.noweight</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>SFO_SFO.ff</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>f.noweight</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:54 2018
-#&gt; Date of summary: Fri Sep 14 17:41:54 2018
+#&gt; Date of fit: Fri Sep 14 18:21:13 2018
+#&gt; Date of summary: Fri Sep 14 18:21:13 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -633,7 +633,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 186 model solutions performed in 0.874 s
+#&gt; Fitted with method Port using 186 model solutions performed in 0.775 s
#&gt;
#&gt; Weighting: none
#&gt;
@@ -741,8 +741,8 @@
#&gt; 120 m1 33.31 28.78984 4.520e+00</div><div class='input'><span class='no'>f.irls</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>SFO_SFO.ff</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>reweight.method</span> <span class='kw'>=</span> <span class='st'>"obs"</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>f.irls</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:56 2018
-#&gt; Date of summary: Fri Sep 14 17:41:56 2018
+#&gt; Date of fit: Fri Sep 14 18:21:15 2018
+#&gt; Date of summary: Fri Sep 14 18:21:15 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -750,7 +750,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 551 model solutions performed in 2.493 s
+#&gt; Fitted with method Port using 551 model solutions performed in 2.282 s
#&gt;
#&gt; Weighting: none
#&gt;
@@ -863,8 +863,8 @@
#&gt; 120 m1 33.31 28.80898 4.501e+00 2.722</div><div class='input'><span class='no'>f.w.mean</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>SFO_SFO.ff</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>weight</span> <span class='kw'>=</span> <span class='st'>"mean"</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>f.w.mean</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:57 2018
-#&gt; Date of summary: Fri Sep 14 17:41:57 2018
+#&gt; Date of fit: Fri Sep 14 18:21:16 2018
+#&gt; Date of summary: Fri Sep 14 18:21:16 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -872,7 +872,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 155 model solutions performed in 0.692 s
+#&gt; Fitted with method Port using 155 model solutions performed in 0.653 s
#&gt;
#&gt; Weighting: mean
#&gt;
@@ -981,8 +981,8 @@
<span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>f.w.value</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:58 2018
-#&gt; Date of summary: Fri Sep 14 17:41:58 2018
+#&gt; Date of fit: Fri Sep 14 18:21:17 2018
+#&gt; Date of summary: Fri Sep 14 18:21:17 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -990,7 +990,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 174 model solutions performed in 0.749 s
+#&gt; Fitted with method Port using 174 model solutions performed in 0.721 s
#&gt;
#&gt; Weighting: manual
#&gt;
@@ -1101,8 +1101,8 @@
<span class='no'>f.w.man</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinfit</span>(<span class='no'>SFO_SFO.ff</span>, <span class='no'>dw</span>, <span class='kw'>err</span> <span class='kw'>=</span> <span class='st'>"err.man"</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>f.w.man</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:41:59 2018
-#&gt; Date of summary: Fri Sep 14 17:41:59 2018
+#&gt; Date of fit: Fri Sep 14 18:21:18 2018
+#&gt; Date of summary: Fri Sep 14 18:21:18 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -1110,7 +1110,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 270 model solutions performed in 1.155 s
+#&gt; Fitted with method Port using 270 model solutions performed in 1.215 s
#&gt;
#&gt; Weighting: manual
#&gt;
@@ -1219,8 +1219,8 @@
<span class='kw'>reweight.method</span> <span class='kw'>=</span> <span class='st'>"obs"</span>)
<span class='fu'>summary</span>(<span class='no'>f.w.man.irls</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:42:03 2018
-#&gt; Date of summary: Fri Sep 14 17:42:03 2018
+#&gt; Date of fit: Fri Sep 14 18:21:22 2018
+#&gt; Date of summary: Fri Sep 14 18:21:22 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -1228,7 +1228,7 @@
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 692 model solutions performed in 3.154 s
+#&gt; Fitted with method Port using 692 model solutions performed in 3.114 s
#&gt;
#&gt; Weighting: manual
#&gt;
diff --git a/docs/reference/mkinmod.html b/docs/reference/mkinmod.html
index fa2880ec..9048c1b1 100644
--- a/docs/reference/mkinmod.html
+++ b/docs/reference/mkinmod.html
@@ -229,7 +229,7 @@ For the definition of model types and their parameters, the equations given
<span class='no'>SFO_SFO</span> <span class='kw'>&lt;-</span> <span class='fu'>mkinmod</span>(
<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>, <span class='st'>"m1"</span>),
<span class='kw'>m1</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>), <span class='kw'>verbose</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)</div><div class='output co'>#&gt; Compilation argument:
-#&gt; /usr/lib/R/bin/R CMD SHLIB file2cf4aedfaf6.c 2&gt; file2cf4aedfaf6.c.err.txt
+#&gt; /usr/lib/R/bin/R CMD SHLIB file49ec17c0788e.c 2&gt; file49ec17c0788e.c.err.txt
#&gt; Program source:
#&gt; 1: #include &lt;R.h&gt;
#&gt; 2:
diff --git a/docs/reference/mkinpredict.html b/docs/reference/mkinpredict.html
index fc90757d..6c30d7a8 100644
--- a/docs/reference/mkinpredict.html
+++ b/docs/reference/mkinpredict.html
@@ -331,7 +331,7 @@
<span class='fu'>c</span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fl'>100</span>, <span class='kw'>m1</span> <span class='kw'>=</span> <span class='fl'>0</span>), <span class='fu'>seq</span>(<span class='fl'>0</span>, <span class='fl'>20</span>, <span class='kw'>by</span> <span class='kw'>=</span> <span class='fl'>0.1</span>),
<span class='kw'>solution_type</span> <span class='kw'>=</span> <span class='st'>"deSolve"</span>, <span class='kw'>use_compiled</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>)[<span class='fl'>201</span>,]))</div><div class='output co'>#&gt; time parent m1
#&gt; 201 20 4.978707 27.46227</div><div class='output co'>#&gt; User System verstrichen
-#&gt; 0.04 0.00 0.04 </div></pre>
+#&gt; 0.035 0.000 0.035 </div></pre>
</div>
<div class="col-md-3 hidden-xs hidden-sm" id="sidebar">
<h2>Contents</h2>
diff --git a/docs/reference/mmkin.html b/docs/reference/mmkin.html
index 768e836c..d630ef3e 100644
--- a/docs/reference/mmkin.html
+++ b/docs/reference/mmkin.html
@@ -189,8 +189,8 @@
<span class='no'>time_1</span> <span class='kw'>&lt;-</span> <span class='fu'>system.time</span>(<span class='no'>fits.4</span> <span class='kw'>&lt;-</span> <span class='fu'>mmkin</span>(<span class='no'>models</span>, <span class='no'>datasets</span>, <span class='kw'>cores</span> <span class='kw'>=</span> <span class='fl'>1</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>))
<span class='no'>time_default</span></div><div class='output co'>#&gt; User System verstrichen
-#&gt; 0.044 0.034 7.567 </div><div class='input'><span class='no'>time_1</span></div><div class='output co'>#&gt; User System verstrichen
-#&gt; 22.374 0.000 22.397 </div><div class='input'>
+#&gt; 0.059 0.027 6.918 </div><div class='input'><span class='no'>time_1</span></div><div class='output co'>#&gt; User System verstrichen
+#&gt; 21.127 0.000 21.141 </div><div class='input'>
<span class='fu'><a href='endpoints.html'>endpoints</a></span>(<span class='no'>fits.0</span><span class='kw'>[[</span><span class='st'>"SFO_lin"</span>, <span class='fl'>2</span>]])</div><div class='output co'>#&gt; $ff
#&gt; parent_M1 parent_sink M1_M2 M1_sink
#&gt; 0.7340480 0.2659520 0.7505686 0.2494314
diff --git a/docs/reference/summary.mkinfit.html b/docs/reference/summary.mkinfit.html
index 01c0d330..cb6beda2 100644
--- a/docs/reference/summary.mkinfit.html
+++ b/docs/reference/summary.mkinfit.html
@@ -206,15 +206,15 @@
<h2 class="hasAnchor" id="examples"><a class="anchor" href="#examples"></a>Examples</h2>
<pre class="examples"><div class='input'> <span class='fu'>summary</span>(<span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='fu'><a href='mkinmod.html'>mkinmod</a></span>(<span class='kw'>parent</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>)), <span class='no'>FOCUS_2006_A</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>))</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:42:54 2018
-#&gt; Date of summary: Fri Sep 14 17:42:54 2018
+#&gt; Date of fit: Fri Sep 14 18:22:10 2018
+#&gt; Date of summary: Fri Sep 14 18:22:10 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent_sink * parent
#&gt;
#&gt; Model predictions using solution type analytical
#&gt;
-#&gt; Fitted with method Port using 35 model solutions performed in 0.078 s
+#&gt; Fitted with method Port using 35 model solutions performed in 0.076 s
#&gt;
#&gt; Weighting: none
#&gt;
diff --git a/docs/reference/transform_odeparms.html b/docs/reference/transform_odeparms.html
index 55640a7f..db92667c 100644
--- a/docs/reference/transform_odeparms.html
+++ b/docs/reference/transform_odeparms.html
@@ -200,8 +200,8 @@ The transformation of sets of formation fractions is fragile, as it supposes
<span class='no'>fit</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='no'>SFO_SFO</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>fit</span>, <span class='kw'>data</span><span class='kw'>=</span><span class='fl'>FALSE</span>) <span class='co'># See transformed and backtransformed parameters</span></div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:43:01 2018
-#&gt; Date of summary: Fri Sep 14 17:43:01 2018
+#&gt; Date of fit: Fri Sep 14 18:22:17 2018
+#&gt; Date of summary: Fri Sep 14 18:22:17 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -209,7 +209,7 @@ The transformation of sets of formation fractions is fragile, as it supposes
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 153 model solutions performed in 0.739 s
+#&gt; Fitted with method Port using 153 model solutions performed in 0.701 s
#&gt;
#&gt; Weighting: none
#&gt;
@@ -276,8 +276,8 @@ The transformation of sets of formation fractions is fragile, as it supposes
</div><div class='input'><span class='no'>fit.2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='no'>SFO_SFO</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>transform_rates</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>fit.2</span>, <span class='kw'>data</span><span class='kw'>=</span><span class='fl'>FALSE</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:43:03 2018
-#&gt; Date of summary: Fri Sep 14 17:43:03 2018
+#&gt; Date of fit: Fri Sep 14 18:22:19 2018
+#&gt; Date of summary: Fri Sep 14 18:22:19 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent
@@ -285,7 +285,7 @@ The transformation of sets of formation fractions is fragile, as it supposes
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 350 model solutions performed in 1.457 s
+#&gt; Fitted with method Port using 350 model solutions performed in 1.431 s
#&gt;
#&gt; Weighting: none
#&gt;
@@ -364,8 +364,8 @@ The transformation of sets of formation fractions is fragile, as it supposes
<span class='no'>fit.ff</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='no'>SFO_SFO.ff</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>fit.ff</span>, <span class='kw'>data</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:43:04 2018
-#&gt; Date of summary: Fri Sep 14 17:43:04 2018
+#&gt; Date of fit: Fri Sep 14 18:22:20 2018
+#&gt; Date of summary: Fri Sep 14 18:22:20 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -373,7 +373,7 @@ The transformation of sets of formation fractions is fragile, as it supposes
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 186 model solutions performed in 0.785 s
+#&gt; Fitted with method Port using 186 model solutions performed in 0.778 s
#&gt;
#&gt; Weighting: none
#&gt;
@@ -448,8 +448,8 @@ The transformation of sets of formation fractions is fragile, as it supposes
<span class='no'>fit.ff.2</span> <span class='kw'>&lt;-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='no'>SFO_SFO.ff.2</span>, <span class='no'>FOCUS_2006_D</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>)
<span class='fu'>summary</span>(<span class='no'>fit.ff.2</span>, <span class='kw'>data</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>)</div><div class='output co'>#&gt; mkin version used for fitting: 0.9.47.5
#&gt; R version used for fitting: 3.5.1
-#&gt; Date of fit: Fri Sep 14 17:43:05 2018
-#&gt; Date of summary: Fri Sep 14 17:43:05 2018
+#&gt; Date of fit: Fri Sep 14 18:22:20 2018
+#&gt; Date of summary: Fri Sep 14 18:22:20 2018
#&gt;
#&gt; Equations:
#&gt; d_parent/dt = - k_parent * parent
@@ -457,7 +457,7 @@ The transformation of sets of formation fractions is fragile, as it supposes
#&gt;
#&gt; Model predictions using solution type deSolve
#&gt;
-#&gt; Fitted with method Port using 104 model solutions performed in 0.429 s
+#&gt; Fitted with method Port using 104 model solutions performed in 0.417 s
#&gt;
#&gt; Weighting: none
#&gt;
diff --git a/test.log b/test.log
index 884b67c1..aab7d12b 100644
--- a/test.log
+++ b/test.log
@@ -2,22 +2,20 @@ Loading mkin
Loading required package: testthat
Testing mkin
✔ | OK F W S | Context
- ⠏ | 0 | Calculation of FOCUS chi2 error levels ⠋ | 1 | Calculation of FOCUS chi2 error levels ⠙ | 2 | Calculation of FOCUS chi2 error levels ✔ | 2 | Calculation of FOCUS chi2 error levels [2.3 s]
- ⠏ | 0 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠋ | 1 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠙ | 2 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠹ | 3 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠸ | 4 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠼ | 5 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠴ | 6 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ✔ | 6 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [2.3 s]
- ⠏ | 0 | The t-test for significant difference from zero ⠋ | 1 | The t-test for significant difference from zero ⠙ | 2 | The t-test for significant difference from zero ✔ | 2 | The t-test for significant difference from zero [4.6 s]
- ⠏ | 0 | Iteratively reweighted least squares (IRLS) fitting ⠋ | 1 | Iteratively reweighted least squares (IRLS) fitting ⠙ | 2 | Iteratively reweighted least squares (IRLS) fitting ⠹ | 3 | Iteratively reweighted least squares (IRLS) fitting ✔ | 3 | Iteratively reweighted least squares (IRLS) fitting [37.5 s]
+ ⠏ | 0 | Calculation of FOCUS chi2 error levels ⠋ | 1 | Calculation of FOCUS chi2 error levels ⠙ | 2 | Calculation of FOCUS chi2 error levels ✔ | 2 | Calculation of FOCUS chi2 error levels [2.2 s]
+ ⠏ | 0 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠋ | 1 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠙ | 2 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠹ | 3 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠸ | 4 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠼ | 5 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ⠴ | 6 | Results for FOCUS D established in expertise for UBA (Ranke 2014) ✔ | 6 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [2.2 s]
+ ⠏ | 0 | The t-test for significant difference from zero ⠋ | 1 | The t-test for significant difference from zero ⠙ | 2 | The t-test for significant difference from zero ✔ | 2 | The t-test for significant difference from zero [4.3 s]
+ ⠏ | 0 | Iteratively reweighted least squares (IRLS) fitting ⠋ | 1 | Iteratively reweighted least squares (IRLS) fitting ⠙ | 2 | Iteratively reweighted least squares (IRLS) fitting ⠹ | 3 | Iteratively reweighted least squares (IRLS) fitting ✔ | 3 | Iteratively reweighted least squares (IRLS) fitting [36.3 s]
⠏ | 0 | Model predictions with mkinpredict ⠋ | 1 | Model predictions with mkinpredict ⠙ | 2 | Model predictions with mkinpredict ⠹ | 3 | Model predictions with mkinpredict ✔ | 3 | Model predictions with mkinpredict [0.3 s]
- ⠏ | 0 | Fitting of parent only models ⠋ | 1 | Fitting of parent only models ⠙ | 2 | Fitting of parent only models ⠹ | 3 | Fitting of parent only models ⠸ | 4 | Fitting of parent only models ⠼ | 5 | Fitting of parent only models ⠴ | 6 | Fitting of parent only models ⠦ | 7 | Fitting of parent only models ⠧ | 8 | Fitting of parent only models ⠇ | 9 | Fitting of parent only models ⠏ | 10 | Fitting of parent only models ⠋ | 11 | Fitting of parent only models ⠙ | 12 | Fitting of parent only models ⠹ | 13 | Fitting of parent only models ⠸ | 14 | Fitting of parent only models ⠼ | 15 | Fitting of parent only models ⠴ | 16 | Fitting of parent only models ⠦ | 17 | Fitting of parent only models ⠧ | 18 | Fitting of parent only models ⠇ | 19 | Fitting of parent only models ⠏ | 20 | Fitting of parent only models ⠋ | 21 | Fitting of parent only models ✔ | 21 | Fitting of parent only models [22.2 s]
+ ⠏ | 0 | Fitting of parent only models ⠋ | 1 | Fitting of parent only models ⠙ | 2 | Fitting of parent only models ⠹ | 3 | Fitting of parent only models ⠸ | 4 | Fitting of parent only models ⠼ | 5 | Fitting of parent only models ⠴ | 6 | Fitting of parent only models ⠦ | 7 | Fitting of parent only models ⠧ | 8 | Fitting of parent only models ⠇ | 9 | Fitting of parent only models ⠏ | 10 | Fitting of parent only models ⠋ | 11 | Fitting of parent only models ⠙ | 12 | Fitting of parent only models ⠹ | 13 | Fitting of parent only models ⠸ | 14 | Fitting of parent only models ⠼ | 15 | Fitting of parent only models ⠴ | 16 | Fitting of parent only models ⠦ | 17 | Fitting of parent only models ⠧ | 18 | Fitting of parent only models ⠇ | 19 | Fitting of parent only models ⠏ | 20 | Fitting of parent only models ⠋ | 21 | Fitting of parent only models ✔ | 21 | Fitting of parent only models [21.8 s]
⠏ | 0 | Complex test case from Schaefer et al. (2007) Piacenza paper ⠋ | 1 | Complex test case from Schaefer et al. (2007) Piacenza paper ⠙ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper ✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper [5.4 s]
- ⠏ | 0 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠋ | 1 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠙ | 2 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠹ | 3 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠸ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) ✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [6.9 s]
- ⠏ | 0 | Calculation of maximum time weighted average concentrations (TWAs) ⠋ | 1 | Calculation of maximum time weighted average concentrations (TWAs) ⠙ | 2 | Calculation of maximum time weighted average concentrations (TWAs) ⠹ | 3 | Calculation of maximum time weighted average concentrations (TWAs) ✔ | 3 | Calculation of maximum time weighted average concentrations (TWAs) [4.9 s]
+ ⠏ | 0 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠋ | 1 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠙ | 2 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠹ | 3 | Results for synthetic data established in expertise for UBA (Ranke 2014) ⠸ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) ✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [6.7 s]
+ ⠏ | 0 | Calculation of maximum time weighted average concentrations (TWAs) ⠋ | 1 | Calculation of maximum time weighted average concentrations (TWAs) ⠙ | 2 | Calculation of maximum time weighted average concentrations (TWAs) ⠹ | 3 | Calculation of maximum time weighted average concentrations (TWAs) ✔ | 3 | Calculation of maximum time weighted average concentrations (TWAs) [4.6 s]
══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 86.5 s
+Duration: 84.0 s
OK: 46
Failed: 0
Warnings: 0
Skipped: 0
-
-Nice code.
diff --git a/tests/testthat/test_FOCUS_chi2_error_level.R b/tests/testthat/test_FOCUS_chi2_error_level.R
index 2db2f4e6..1f1e2a06 100644
--- a/tests/testthat/test_FOCUS_chi2_error_level.R
+++ b/tests/testthat/test_FOCUS_chi2_error_level.R
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-15 Johannes Ranke
+# Copyright (C) 2014,2015,2018 Johannes Ranke
# Contact: jranke@uni-bremen.de
# This file is part of the R package mkin
@@ -39,6 +39,7 @@ test_that("Chi2 error levels for FOCUS D are as in mkin 0.9-33", {
})
test_that("Chi2 error levels for FOCUS E are as in mkin 0.9-33", {
+ skip_on_cran()
fit <- mkinfit(SFO_SFO.ff, FOCUS_2006_E, quiet = TRUE)
diff --git a/tests/testthat/test_parent_only.R b/tests/testthat/test_parent_only.R
index 9a3844cf..ee0cc144 100644
--- a/tests/testthat/test_parent_only.R
+++ b/tests/testthat/test_parent_only.R
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 Johannes Ranke
+# Copyright (C) 2015,2018 Johannes Ranke
# Contact: jranke@uni-bremen.de
# This file is part of the R package mkin
@@ -89,6 +89,7 @@ test_that("Fits for FOCUS A deviate less than 0.1% from median of values from FO
})
test_that("Fits for FOCUS B deviate less than 0.1% from median of values from FOCUS report", {
+ skip_on_cran()
fit.B.SFO <- list(mkinfit("SFO", FOCUS_2006_B, quiet = TRUE))
median.B.SFO <- as.numeric(lapply(subset(FOCUS_2006_SFO_ref_A_to_F,
@@ -202,6 +203,7 @@ test_that("DFOP fits give approximately (0.001%) equal results with different so
})
test_that("SFORB fits give approximately (0.002%) equal results with different solution methods", {
+ skip_on_cran()
fit.B.SFORB.default <- mkinfit(SFORB, FOCUS_2006_B, quiet=TRUE)$bparms.optim
fits.B.SFORB <- list()
diff --git a/tests/testthat/test_twa.R b/tests/testthat/test_twa.R
index 27a76ee8..d5c0b98b 100644
--- a/tests/testthat/test_twa.R
+++ b/tests/testthat/test_twa.R
@@ -1,4 +1,4 @@
-# Copyright (C) 2016,2017 Johannes Ranke
+# Copyright (C) 2016,2017,2018 Johannes Ranke
# Contact: jranke@uni-bremen.de
# This file is part of the R package mkin
@@ -22,10 +22,6 @@ twa_models <- c("SFO", "FOMC", "DFOP")
fits <- mmkin(twa_models, list(FOCUS_D = FOCUS_2006_D),
quiet = TRUE, cores = 1)
-SFO_SFO <- mkinmod(parent = list(type = "SFO", to = "m1"),
- m1 = list(type = "SFO"), quiet = TRUE)
-fit.m1 <- mkinfit(SFO_SFO, FOCUS_2006_D, quiet = TRUE)
-
test_that("Time weighted average concentrations are correct", {
outtimes_7 <- seq(0, 7, length.out = 10000)
for (model in twa_models) {

Contact - Imprint