diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2019-03-04 10:12:43 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-03-04 10:12:43 +0100 |
commit | d0a358a8f4fd03c95536409523e492eb15726f44 (patch) | |
tree | fefa34562fb4557921d88f64c6827401a9c1ed99 /docs/reference | |
parent | 4e85356bbe535aaf5bc7dc25238ed6a8d1f9913c (diff) |
Review tests and examples based on winbuilder results
Static documentation rebuilt by pkgdown
Diffstat (limited to 'docs/reference')
-rw-r--r-- | docs/reference/Extract.mmkin.html | 12 | ||||
-rw-r--r-- | docs/reference/NAFTA_SOP_2015.html | 30 | ||||
-rw-r--r-- | docs/reference/NAFTA_SOP_Attachment.html | 26 | ||||
-rw-r--r-- | docs/reference/logLik.mkinfit.html | 4 | ||||
-rw-r--r-- | docs/reference/mccall81_245T.html | 18 | ||||
-rw-r--r-- | docs/reference/mkinfit.html | 46 | ||||
-rw-r--r-- | docs/reference/mkinmod.html | 2 | ||||
-rw-r--r-- | docs/reference/mkinpredict.html | 2 | ||||
-rw-r--r-- | docs/reference/mmkin.html | 4 | ||||
-rw-r--r-- | docs/reference/nafta.html | 30 | ||||
-rw-r--r-- | docs/reference/print.nafta.html | 6 | ||||
-rw-r--r-- | docs/reference/summary.mkinfit.html | 6 | ||||
-rw-r--r-- | docs/reference/test_data_from_UBA_2014.html | 2 | ||||
-rw-r--r-- | docs/reference/transform_odeparms.html | 24 |
14 files changed, 108 insertions, 104 deletions
diff --git a/docs/reference/Extract.mmkin.html b/docs/reference/Extract.mmkin.html index 93be7412..96b9f218 100644 --- a/docs/reference/Extract.mmkin.html +++ b/docs/reference/Extract.mmkin.html @@ -283,7 +283,7 @@ #> #> $time #> User System verstrichen -#> 0.071 0.000 0.071 +#> 0.069 0.000 0.069 #> #> $mkinmod #> <mkinmod> model generated with @@ -472,8 +472,8 @@ #> } #> return(mC) #> } -#> <bytecode: 0x55555c80a350> -#> <environment: 0x55555b478bb8> +#> <bytecode: 0x55555c1f3208> +#> <environment: 0x555555c27dc0> #> #> $cost_notrans #> function (P) @@ -495,8 +495,8 @@ #> scaleVar = scaleVar) #> return(mC) #> } -#> <bytecode: 0x55555c522e40> -#> <environment: 0x55555b478bb8> +#> <bytecode: 0x55555b84fce8> +#> <environment: 0x555555c27dc0> #> #> $hessian_notrans #> parent_0 k_parent_sink @@ -563,7 +563,7 @@ #> 99.17407 #> #> $date -#> [1] "Tue Feb 26 21:07:19 2019" +#> [1] "Mon Mar 4 10:07:37 2019" #> #> $version #> [1] "0.9.48.1" diff --git a/docs/reference/NAFTA_SOP_2015.html b/docs/reference/NAFTA_SOP_2015.html index c8b97493..d56c0ca3 100644 --- a/docs/reference/NAFTA_SOP_2015.html +++ b/docs/reference/NAFTA_SOP_2015.html @@ -165,29 +165,29 @@ #> #> Parameters: #> $SFO -#> Estimate Pr(>t) Lower Upper -#> parent_0 83.755751519 8.076390e-15 76.928220975 90.583282063 -#> k_parent_sink 0.001703321 7.452357e-05 0.001108568 0.002617164 +#> Estimate Pr(>t) Lower Upper +#> parent_0 83.7558 8.08e-15 76.92822 90.58328 +#> k_parent_sink 0.0017 7.45e-05 0.00111 0.00262 #> #> $IORE -#> Estimate Pr(>t) Lower Upper -#> parent_0 9.685291e+01 NA 8.752855e+01 1.061773e+02 -#> k__iore_parent_sink 8.403401e-14 NA 1.092058e-19 6.466429e-08 -#> N_parent 6.684457e+00 NA 3.538510e+00 9.830404e+00 +#> Estimate Pr(>t) Lower Upper +#> parent_0 9.69e+01 NA 8.75e+01 1.06e+02 +#> k__iore_parent_sink 8.40e-14 NA 1.09e-19 6.47e-08 +#> N_parent 6.68e+00 NA 3.54e+00 9.83e+00 #> #> $DFOP -#> Estimate Pr(>t) Lower Upper -#> parent_0 9.755655e+01 4.439930e-13 8.884447e+01 1.062686e+02 -#> k1 4.240633e-02 3.554769e-02 1.414189e-02 1.271610e-01 -#> k2 8.237928e-04 2.060933e-02 3.172784e-04 2.138925e-03 -#> g 2.881037e-01 1.313715e-04 1.783967e-01 4.299694e-01 +#> Estimate Pr(>t) Lower Upper +#> parent_0 9.76e+01 4.44e-13 8.88e+01 1.06e+02 +#> k1 4.24e-02 3.55e-02 1.41e-02 1.27e-01 +#> k2 8.24e-04 2.06e-02 3.17e-04 2.14e-03 +#> g 2.88e-01 1.31e-04 1.78e-01 4.30e-01 #> #> #> DTx values: #> DT50 DT90 DT50_rep -#> SFO 407 1350 407 -#> IORE 541 5190000 1560000 -#> DFOP 429 2380 841 +#> SFO 407 1352 407 +#> IORE 541 5192060 1562966 +#> DFOP 429 2383 841 #> #> Representative half-life: #> [1] 841.4096</div><div class='input'> <span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='no'>nafta_evaluation</span>)</div><div class='img'><img src='NAFTA_SOP_2015-1.png' alt='' width='700' height='433' /></div></pre> diff --git a/docs/reference/NAFTA_SOP_Attachment.html b/docs/reference/NAFTA_SOP_Attachment.html index 373da052..22d9c9fd 100644 --- a/docs/reference/NAFTA_SOP_Attachment.html +++ b/docs/reference/NAFTA_SOP_Attachment.html @@ -152,7 +152,7 @@ <h2 class="hasAnchor" id="examples"><a class="anchor" href="#examples"></a>Examples</h2> - <pre class="examples"><div class='input'> <span class='no'>nafta_att_p5a</span> <span class='kw'><-</span> <span class='fu'><a href='nafta.html'>nafta</a></span>(<span class='no'>NAFTA_SOP_Attachment</span><span class='kw'>[[</span><span class='st'>"p5a"</span>]], <span class='kw'>cores</span> <span class='kw'>=</span> <span class='fl'>1</span>)</div><div class='output co'>#> <span class='message'>The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</span></div><div class='output co'>#> <span class='message'>The half-life obtained from the IORE model may be used</span></div><div class='input'> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/print'>print</a></span>(<span class='no'>nafta_att_p5a</span>)</div><div class='output co'>#> Sums of squares: + <pre class="examples"><div class='input'> <span class='no'>nafta_att_p5a</span> <span class='kw'><-</span> <span class='fu'><a href='nafta.html'>nafta</a></span>(<span class='no'>NAFTA_SOP_Attachment</span><span class='kw'>[[</span><span class='st'>"p5a"</span>]], <span class='kw'>cores</span> <span class='kw'>=</span> <span class='fl'>1</span>)</div><div class='output co'>#> <span class='warning'>Warning: Could not estimate covariance matrix; singular system.</span></div><div class='output co'>#> <span class='message'>The SFO model is rejected as S_SFO is equal or higher than the critical value S_c</span></div><div class='output co'>#> <span class='message'>The half-life obtained from the IORE model may be used</span></div><div class='input'> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/print'>print</a></span>(<span class='no'>nafta_att_p5a</span>)</div><div class='output co'>#> Sums of squares: #> SFO IORE DFOP #> 465.21753 56.27506 32.06401 #> @@ -161,22 +161,22 @@ #> #> Parameters: #> $SFO -#> Estimate Pr(>t) Lower Upper -#> parent_0 95.84012168 1.095639e-21 92.120517864 99.55972549 -#> k_parent_sink 0.01024015 1.710227e-12 0.008996874 0.01165524 +#> Estimate Pr(>t) Lower Upper +#> parent_0 95.8401 1.10e-21 92.121 99.5597 +#> k_parent_sink 0.0102 1.71e-12 0.009 0.0117 #> #> $IORE -#> Estimate Pr(>t) Lower Upper -#> parent_0 1.007532e+02 2.365797e-26 9.891170e+01 1.025947e+02 -#> k__iore_parent_sink 1.544192e-05 8.733384e-02 3.482391e-06 6.847393e-05 -#> N_parent 2.569877e+00 1.140446e-11 2.215298e+00 2.924456e+00 +#> Estimate Pr(>t) Lower Upper +#> parent_0 1.01e+02 2.37e-26 9.89e+01 1.03e+02 +#> k__iore_parent_sink 1.54e-05 8.73e-02 3.48e-06 6.85e-05 +#> N_parent 2.57e+00 1.14e-11 2.22e+00 2.92e+00 #> #> $DFOP -#> Estimate Pr(>t) Lower Upper -#> parent_0 9.994630e+01 4.330861e-27 NA NA -#> k1 2.674255e-02 3.171390e-05 NA NA -#> k2 2.161318e-12 5.000000e-01 NA NA -#> g 6.465276e-01 2.129114e-05 NA NA +#> Estimate Pr(>t) Lower Upper +#> parent_0 9.99e+01 4.33e-27 NA NA +#> k1 2.67e-02 3.17e-05 NA NA +#> k2 2.16e-12 5.00e-01 NA NA +#> g 6.47e-01 2.13e-05 NA NA #> #> #> DTx values: diff --git a/docs/reference/logLik.mkinfit.html b/docs/reference/logLik.mkinfit.html index 229f8b04..fc4193cb 100644 --- a/docs/reference/logLik.mkinfit.html +++ b/docs/reference/logLik.mkinfit.html @@ -195,7 +195,7 @@ In the case of iterative reweighting, the variances obtained by this <h2 class="hasAnchor" id="examples"><a class="anchor" href="#examples"></a>Examples</h2> - <pre class="examples"><div class='input'> <span class='no'>sfo_sfo</span> <span class='kw'><-</span> <span class='fu'><a href='mkinmod.html'>mkinmod</a></span>( + <pre class="examples"><div class='input'> </div><div class='input'> <span class='no'>sfo_sfo</span> <span class='kw'><-</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='kw'>to</span> <span class='kw'>=</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>) )</div><div class='output co'>#> <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'> <span class='no'>d_t</span> <span class='kw'><-</span> <span class='no'>FOCUS_2006_D</span> @@ -209,7 +209,7 @@ In the case of iterative reweighting, the variances obtained by this #> f_nw 5 204.4619 #> f_obs 6 205.8727 #> f_tc 6 143.8773 -#> f_man 4 291.8000</div></pre> +#> f_man 4 291.8000</div><div class='input'> </div></pre> </div> <div class="col-md-3 hidden-xs hidden-sm" id="sidebar"> <h2>Contents</h2> diff --git a/docs/reference/mccall81_245T.html b/docs/reference/mccall81_245T.html index bfb34489..5fbbc962 100644 --- a/docs/reference/mccall81_245T.html +++ b/docs/reference/mccall81_245T.html @@ -161,10 +161,10 @@ <pre class="examples"><div class='input'> <span class='no'>SFO_SFO_SFO</span> <span class='kw'><-</span> <span class='fu'><a href='mkinmod.html'>mkinmod</a></span>(<span class='kw'>T245</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/list'>list</a></span>(<span class='kw'>type</span> <span class='kw'>=</span> <span class='st'>"SFO"</span>, <span class='kw'>to</span> <span class='kw'>=</span> <span class='st'>"phenol"</span>), <span class='kw'>phenol</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/list'>list</a></span>(<span class='kw'>type</span> <span class='kw'>=</span> <span class='st'>"SFO"</span>, <span class='kw'>to</span> <span class='kw'>=</span> <span class='st'>"anisole"</span>), <span class='kw'>anisole</span> <span class='kw'>=</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/list'>list</a></span>(<span class='kw'>type</span> <span class='kw'>=</span> <span class='st'>"SFO"</span>))</div><div class='output co'>#> <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'><-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='no'>SFO_SFO_SFO</span>, <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/subset'>subset</a></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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> mkin version used for fitting: 0.9.48.1 + <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> <span class='warning'>Warning: Could not estimate covariance matrix; singular system.</span></div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:07:42 2019 -#> Date of summary: Tue Feb 26 21:07:42 2019 +#> Date of fit: Mon Mar 4 10:08:00 2019 +#> Date of summary: Mon Mar 4 10:08:00 2019 #> #> Equations: #> d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245 @@ -174,7 +174,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 574 model solutions performed in 3.766 s +#> Fitted with method Port using 574 model solutions performed in 3.762 s #> #> Weighting: none #> @@ -210,8 +210,8 @@ #> log_k_phenol_anisole -0.9037 NA NA NA #> log_k_anisole_sink -5.0090 NA NA NA #> -#> Parameter correlation:</div><div class='output co'>#> <span class='warning'>Warning: Could not estimate covariance matrix; singular system:</span></div><div class='output co'>#> Could not estimate covariance matrix; singular system: -#> +#> Parameter correlation: +#> Could not estimate covariance matrix; singular system. #> Residual standard error: 2.78 on 18 degrees of freedom #> #> Backtransformed parameters: @@ -252,8 +252,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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:07:44 2019 -#> Date of summary: Tue Feb 26 21:07:44 2019 +#> Date of fit: Mon Mar 4 10:08:02 2019 +#> Date of summary: Mon Mar 4 10:08:02 2019 #> #> Equations: #> d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245 @@ -263,7 +263,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 246 model solutions performed in 1.612 s +#> Fitted with method Port using 246 model solutions performed in 1.598 s #> #> Weighting: none #> diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html index 2494faf9..cd6ace43 100644 --- a/docs/reference/mkinfit.html +++ b/docs/reference/mkinfit.html @@ -441,15 +441,15 @@ <span class='no'>fit</span> <span class='kw'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>fit</span>)</div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:07:47 2019 -#> Date of summary: Tue Feb 26 21:07:47 2019 +#> Date of fit: Mon Mar 4 10:08:05 2019 +#> Date of summary: Mon Mar 4 10:08:05 2019 #> #> Equations: #> d_parent/dt = - (alpha/beta) * 1/((time/beta) + 1) * parent #> #> Model predictions using solution type analytical #> -#> Fitted with method Port using 64 model solutions performed in 0.161 s +#> Fitted with method Port using 64 model solutions performed in 0.159 s #> #> Weighting: none #> @@ -518,7 +518,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'>#> <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'><a href='https://www.rdocumentation.org/packages/base/topics/print'>print</a></span>(<span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/system.time'>system.time</a></span>(<span class='no'>fit</span> <span class='kw'><-</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'>#> User System verstrichen -#> 1.111 0.000 1.112 </div><div class='input'><span class='fu'><a href='https://www.rdocumentation.org/packages/stats/topics/coef'>coef</a></span>(<span class='no'>fit</span>)</div><div class='output co'>#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink +#> 1.026 0.000 1.035 </div><div class='input'><span class='fu'><a href='https://www.rdocumentation.org/packages/stats/topics/coef'>coef</a></span>(<span class='no'>fit</span>)</div><div class='output co'>#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink #> 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'>#> $ff #> parent_sink parent_m1 m1_sink #> 0.485524 0.514476 1.000000 @@ -593,7 +593,7 @@ #> Model cost at call 146 : 371.2134 #> Optimisation by method Port successfully terminated. #> User System verstrichen -#> 0.826 0.000 0.827 </div><div class='input'><span class='fu'><a href='https://www.rdocumentation.org/packages/stats/topics/coef'>coef</a></span>(<span class='no'>fit.deSolve</span>)</div><div class='output co'>#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink +#> 0.814 0.008 0.830 </div><div class='input'><span class='fu'><a href='https://www.rdocumentation.org/packages/stats/topics/coef'>coef</a></span>(<span class='no'>fit.deSolve</span>)</div><div class='output co'>#> parent_0 log_k_parent_sink log_k_parent_m1 log_k_m1_sink #> 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'>#> $ff #> parent_sink parent_m1 m1_sink #> 0.485524 0.514476 1.000000 @@ -631,8 +631,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'>#> <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'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f.noweight</span>)</div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:07:59 2019 -#> Date of summary: Tue Feb 26 21:07:59 2019 +#> Date of fit: Mon Mar 4 10:08:17 2019 +#> Date of summary: Mon Mar 4 10:08:17 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -640,7 +640,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 186 model solutions performed in 0.841 s +#> Fitted with method Port using 186 model solutions performed in 0.853 s #> #> Weighting: none #> @@ -748,8 +748,8 @@ #> 120 m1 33.31 28.78984 4.520e+00</div><div class='input'><span class='no'>f.irls</span> <span class='kw'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f.irls</span>)</div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:08:02 2019 -#> Date of summary: Tue Feb 26 21:08:02 2019 +#> Date of fit: Mon Mar 4 10:08:20 2019 +#> Date of summary: Mon Mar 4 10:08:20 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -757,7 +757,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 551 model solutions performed in 2.596 s +#> Fitted with method Port using 551 model solutions performed in 2.525 s #> #> Weighting: none #> @@ -870,8 +870,8 @@ #> 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'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f.w.mean</span>)</div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:08:03 2019 -#> Date of summary: Tue Feb 26 21:08:03 2019 +#> Date of fit: Mon Mar 4 10:08:21 2019 +#> Date of summary: Mon Mar 4 10:08:21 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -879,7 +879,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 155 model solutions performed in 0.701 s +#> Fitted with method Port using 155 model solutions performed in 0.706 s #> #> Weighting: mean #> @@ -988,8 +988,8 @@ <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>) <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f.w.value</span>)</div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:08:03 2019 -#> Date of summary: Tue Feb 26 21:08:03 2019 +#> Date of fit: Mon Mar 4 10:08:22 2019 +#> Date of summary: Mon Mar 4 10:08:22 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -997,7 +997,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 174 model solutions performed in 0.795 s +#> Fitted with method Port using 174 model solutions performed in 0.875 s #> #> Weighting: manual #> @@ -1108,8 +1108,8 @@ <span class='no'>f.w.man</span> <span class='kw'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f.w.man</span>)</div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:08:05 2019 -#> Date of summary: Tue Feb 26 21:08:05 2019 +#> Date of fit: Mon Mar 4 10:08:23 2019 +#> Date of summary: Mon Mar 4 10:08:23 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -1117,7 +1117,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 270 model solutions performed in 1.24 s +#> Fitted with method Port using 270 model solutions performed in 1.279 s #> #> Weighting: manual #> @@ -1226,8 +1226,8 @@ <span class='kw'>reweight.method</span> <span class='kw'>=</span> <span class='st'>"obs"</span>) <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f.w.man.irls</span>)</div><div class='output co'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:08:08 2019 -#> Date of summary: Tue Feb 26 21:08:08 2019 +#> Date of fit: Mon Mar 4 10:08:26 2019 +#> Date of summary: Mon Mar 4 10:08:26 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -1235,7 +1235,7 @@ #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 692 model solutions performed in 3.192 s +#> Fitted with method Port using 692 model solutions performed in 3.203 s #> #> Weighting: manual #> diff --git a/docs/reference/mkinmod.html b/docs/reference/mkinmod.html index 8c2ec38c..ddb695e3 100644 --- a/docs/reference/mkinmod.html +++ b/docs/reference/mkinmod.html @@ -234,7 +234,7 @@ For the definition of model types and their parameters, the equations given <span class='no'>SFO_SFO</span> <span class='kw'><-</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'>#> Compilation argument: -#> /usr/lib/R/bin/R CMD SHLIB file3dbe7c3499b.c 2> file3dbe7c3499b.c.err.txt +#> /usr/lib/R/bin/R CMD SHLIB file135d360177d0.c 2> file135d360177d0.c.err.txt #> Program source: #> 1: #include <R.h> #> 2: diff --git a/docs/reference/mkinpredict.html b/docs/reference/mkinpredict.html index fb4afa9a..a0880959 100644 --- a/docs/reference/mkinpredict.html +++ b/docs/reference/mkinpredict.html @@ -328,7 +328,7 @@ <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/c'>c</a></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'><a href='https://www.rdocumentation.org/packages/base/topics/seq'>seq</a></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'>"eigen"</span>)[<span class='fl'>201</span>,]))</div><div class='output co'>#> time parent m1 #> 201 20 4.978707 27.46227</div><div class='output co'>#> User System verstrichen -#> 0.004 0.000 0.003 </div><div class='input'> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/system.time'>system.time</a></span>( +#> 0.004 0.000 0.004 </div><div class='input'> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/system.time'>system.time</a></span>( <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/print'>print</a></span>(<span class='fu'>mkinpredict</span>(<span class='no'>SFO_SFO</span>, <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/c'>c</a></span>(<span class='kw'>k_parent_m1</span> <span class='kw'>=</span> <span class='fl'>0.05</span>, <span class='kw'>k_parent_sink</span> <span class='kw'>=</span> <span class='fl'>0.1</span>, <span class='kw'>k_m1_sink</span> <span class='kw'>=</span> <span class='fl'>0.01</span>), <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/c'>c</a></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'><a href='https://www.rdocumentation.org/packages/base/topics/seq'>seq</a></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='fl'>201</span>,]))</div><div class='output co'>#> time parent m1 diff --git a/docs/reference/mmkin.html b/docs/reference/mmkin.html index 44aaaa79..5f82f41f 100644 --- a/docs/reference/mmkin.html +++ b/docs/reference/mmkin.html @@ -194,8 +194,8 @@ <span class='no'>time_1</span> <span class='kw'><-</span> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/system.time'>system.time</a></span>(<span class='no'>fits.4</span> <span class='kw'><-</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'>#> User System verstrichen -#> 0.041 0.032 6.955 </div><div class='input'><span class='no'>time_1</span></div><div class='output co'>#> User System verstrichen -#> 22.625 0.004 22.646 </div><div class='input'> +#> 0.057 0.014 6.939 </div><div class='input'><span class='no'>time_1</span></div><div class='output co'>#> User System verstrichen +#> 22.525 0.000 22.538 </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'>#> $ff #> parent_M1 parent_sink M1_M2 M1_sink #> 0.7340480 0.2659520 0.7505686 0.2494314 diff --git a/docs/reference/nafta.html b/docs/reference/nafta.html index c05ce4cb..38e642df 100644 --- a/docs/reference/nafta.html +++ b/docs/reference/nafta.html @@ -192,29 +192,29 @@ #> #> Parameters: #> $SFO -#> Estimate Pr(>t) Lower Upper -#> parent_0 83.755751519 8.076390e-15 76.928220975 90.583282063 -#> k_parent_sink 0.001703321 7.452357e-05 0.001108568 0.002617164 +#> Estimate Pr(>t) Lower Upper +#> parent_0 83.7558 8.08e-15 76.92822 90.58328 +#> k_parent_sink 0.0017 7.45e-05 0.00111 0.00262 #> #> $IORE -#> Estimate Pr(>t) Lower Upper -#> parent_0 9.685291e+01 NA 8.752855e+01 1.061773e+02 -#> k__iore_parent_sink 8.403401e-14 NA 1.092058e-19 6.466429e-08 -#> N_parent 6.684457e+00 NA 3.538510e+00 9.830404e+00 +#> Estimate Pr(>t) Lower Upper +#> parent_0 9.69e+01 NA 8.75e+01 1.06e+02 +#> k__iore_parent_sink 8.40e-14 NA 1.09e-19 6.47e-08 +#> N_parent 6.68e+00 NA 3.54e+00 9.83e+00 #> #> $DFOP -#> Estimate Pr(>t) Lower Upper -#> parent_0 9.755655e+01 4.439930e-13 8.884447e+01 1.062686e+02 -#> k1 4.240633e-02 3.554769e-02 1.414189e-02 1.271610e-01 -#> k2 8.237928e-04 2.060933e-02 3.172784e-04 2.138925e-03 -#> g 2.881037e-01 1.313715e-04 1.783967e-01 4.299694e-01 +#> Estimate Pr(>t) Lower Upper +#> parent_0 9.76e+01 4.44e-13 8.88e+01 1.06e+02 +#> k1 4.24e-02 3.55e-02 1.41e-02 1.27e-01 +#> k2 8.24e-04 2.06e-02 3.17e-04 2.14e-03 +#> g 2.88e-01 1.31e-04 1.78e-01 4.30e-01 #> #> #> DTx values: #> DT50 DT90 DT50_rep -#> SFO 407 1350 407 -#> IORE 541 5190000 1560000 -#> DFOP 429 2380 841 +#> SFO 407 1352 407 +#> IORE 541 5192060 1562966 +#> DFOP 429 2383 841 #> #> Representative half-life: #> [1] 841.4096</div><div class='input'> <span class='fu'><a href='https://www.rdocumentation.org/packages/graphics/topics/plot'>plot</a></span>(<span class='no'>nafta_evaluation</span>)</div><div class='img'><img src='nafta-1.png' alt='' width='700' height='433' /></div></pre> diff --git a/docs/reference/print.nafta.html b/docs/reference/print.nafta.html index 31bd2956..1b35053f 100644 --- a/docs/reference/print.nafta.html +++ b/docs/reference/print.nafta.html @@ -137,7 +137,7 @@ </div> <pre class="usage"><span class='co'># S3 method for nafta</span> -<span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/print'>print</a></span>(<span class='no'>x</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>, <span class='no'>...</span>)</pre> +<span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/print'>print</a></span>(<span class='no'>x</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>, <span class='kw'>digits</span> <span class='kw'>=</span> <span class='fl'>3</span>, <span class='no'>...</span>)</pre> <h2 class="hasAnchor" id="arguments"><a class="anchor" href="#arguments"></a>Arguments</h2> <table class="ref-arguments"> @@ -151,6 +151,10 @@ <td><p>Should the evaluation text be shown?</p></td> </tr> <tr> + <th>digits</th> + <td><p>Number of digits to be used for printing parameters and dissipation times.</p></td> + </tr> + <tr> <th>…</th> <td><p>Not used.</p></td> </tr> diff --git a/docs/reference/summary.mkinfit.html b/docs/reference/summary.mkinfit.html index 8d9e0287..e2f4d2e2 100644 --- a/docs/reference/summary.mkinfit.html +++ b/docs/reference/summary.mkinfit.html @@ -211,15 +211,15 @@ <h2 class="hasAnchor" id="examples"><a class="anchor" href="#examples"></a>Examples</h2> <pre class="examples"><div class='input'> <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:09:01 2019 -#> Date of summary: Tue Feb 26 21:09:01 2019 +#> Date of fit: Mon Mar 4 10:09:19 2019 +#> Date of summary: Mon Mar 4 10:09:19 2019 #> #> Equations: #> d_parent/dt = - k_parent_sink * parent #> #> Model predictions using solution type analytical #> -#> Fitted with method Port using 35 model solutions performed in 0.084 s +#> Fitted with method Port using 35 model solutions performed in 0.086 s #> #> Weighting: none #> diff --git a/docs/reference/test_data_from_UBA_2014.html b/docs/reference/test_data_from_UBA_2014.html index 12904a1f..28e8b41c 100644 --- a/docs/reference/test_data_from_UBA_2014.html +++ b/docs/reference/test_data_from_UBA_2014.html @@ -160,7 +160,7 @@ <span class='no'>m_ws</span> <span class='kw'><-</span> <span class='fu'><a href='mkinmod.html'>mkinmod</a></span>(<span class='kw'>parent_w</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>, <span class='st'>"parent_s"</span>), <span class='kw'>parent_s</span> <span class='kw'>=</span> <span class='fu'><a href='mkinsub.html'>mkinsub</a></span>(<span class='st'>"SFO"</span>, <span class='st'>"parent_w"</span>))</div><div class='output co'>#> <span class='message'>Successfully compiled differential equation model from auto-generated C code.</span></div><div class='input'> <span class='no'>f_river</span> <span class='kw'><-</span> <span class='fu'><a href='mkinfit.html'>mkinfit</a></span>(<span class='no'>m_ws</span>, <span class='no'>test_data_from_UBA_2014</span><span class='kw'>[[</span><span class='fl'>1</span>]]$<span class='no'>data</span>, <span class='kw'>quiet</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>) <span class='fu'><a href='plot.mkinfit.html'>plot_sep</a></span>(<span class='no'>f_river</span>)</div><div class='img'><img src='test_data_from_UBA_2014-1.png' alt='' width='700' height='433' /></div><div class='input'> - <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f_river</span>)$<span class='no'>bpar</span></div><div class='output co'>#> Estimate se_notrans t value Pr(>t) Lower + <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></span>(<span class='no'>f_river</span>)$<span class='no'>bpar</span></div><div class='output co'>#> <span class='warning'>Warning: Could not estimate covariance matrix; singular system.</span></div><div class='output co'>#> Estimate se_notrans t value Pr(>t) Lower #> parent_w_0 9.598567e+01 2.33959800 4.102657e+01 9.568967e-19 NA #> k_parent_w_sink 3.603743e-01 0.03497750 1.030303e+01 4.989002e-09 NA #> k_parent_w_parent_s 6.031371e-02 0.01746024 3.454346e+00 1.514723e-03 NA diff --git a/docs/reference/transform_odeparms.html b/docs/reference/transform_odeparms.html index 115ee0ca..3148f00b 100644 --- a/docs/reference/transform_odeparms.html +++ b/docs/reference/transform_odeparms.html @@ -205,8 +205,8 @@ The transformation of sets of formation fractions is fragile, as it supposes <span class='no'>fit</span> <span class='kw'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:09:09 2019 -#> Date of summary: Tue Feb 26 21:09:09 2019 +#> Date of fit: Mon Mar 4 10:09:27 2019 +#> Date of summary: Mon Mar 4 10:09:27 2019 #> #> Equations: #> d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -214,7 +214,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 153 model solutions performed in 0.709 s +#> Fitted with method Port using 153 model solutions performed in 0.699 s #> #> Weighting: none #> @@ -281,8 +281,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'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:09:11 2019 -#> Date of summary: Tue Feb 26 21:09:11 2019 +#> Date of fit: Mon Mar 4 10:09:29 2019 +#> Date of summary: Mon Mar 4 10:09:29 2019 #> #> Equations: #> d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -290,7 +290,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 350 model solutions performed in 1.588 s +#> Fitted with method Port using 350 model solutions performed in 1.584 s #> #> Weighting: none #> @@ -369,8 +369,8 @@ The transformation of sets of formation fractions is fragile, as it supposes <span class='no'>fit.ff</span> <span class='kw'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:09:12 2019 -#> Date of summary: Tue Feb 26 21:09:12 2019 +#> Date of fit: Mon Mar 4 10:09:30 2019 +#> Date of summary: Mon Mar 4 10:09:30 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -378,7 +378,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 186 model solutions performed in 0.849 s +#> Fitted with method Port using 186 model solutions performed in 0.86 s #> #> Weighting: none #> @@ -453,8 +453,8 @@ The transformation of sets of formation fractions is fragile, as it supposes <span class='no'>fit.ff.2</span> <span class='kw'><-</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'><a href='https://www.rdocumentation.org/packages/base/topics/summary'>summary</a></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'>#> mkin version used for fitting: 0.9.48.1 #> R version used for fitting: 3.5.2 -#> Date of fit: Tue Feb 26 21:09:13 2019 -#> Date of summary: Tue Feb 26 21:09:13 2019 +#> Date of fit: Mon Mar 4 10:09:31 2019 +#> Date of summary: Mon Mar 4 10:09:31 2019 #> #> Equations: #> d_parent/dt = - k_parent * parent @@ -462,7 +462,7 @@ The transformation of sets of formation fractions is fragile, as it supposes #> #> Model predictions using solution type deSolve #> -#> Fitted with method Port using 104 model solutions performed in 0.47 s +#> Fitted with method Port using 104 model solutions performed in 0.476 s #> #> Weighting: none #> |