diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2019-02-22 09:53:58 +0100 | 
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2019-02-22 09:53:58 +0100 | 
| commit | 6c0c0986d7c33ebcc290cad12b02eaacafa796ad (patch) | |
| tree | 32271aff5a17e7a0823f8773be48d08fb34abfa5 /docs | |
| parent | 39d5dc6988389f026d5165cac208ec63d0645a77 (diff) | |
Static documentation rebuilt by pkgdown
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/articles/FOCUS_D.html | 8 | ||||
| -rw-r--r-- | docs/articles/FOCUS_L.html | 42 | ||||
| -rw-r--r-- | docs/articles/mkin.html | 2 | ||||
| -rw-r--r-- | docs/articles/twa.html | 2 | ||||
| -rw-r--r-- | docs/articles/web_only/FOCUS_Z.html | 2 | ||||
| -rw-r--r-- | docs/articles/web_only/compiled_models.html | 12 | ||||
| -rw-r--r-- | docs/reference/Extract.mmkin.html | 12 | ||||
| -rw-r--r-- | docs/reference/logistic.solution.html | 7 | ||||
| -rw-r--r-- | docs/reference/mccall81_245T.html | 12 | ||||
| -rw-r--r-- | docs/reference/mkinfit.html | 46 | ||||
| -rw-r--r-- | docs/reference/mkinmod.html | 2 | ||||
| -rw-r--r-- | docs/reference/mkinpredict.html | 6 | ||||
| -rw-r--r-- | docs/reference/mmkin.html | 4 | ||||
| -rw-r--r-- | docs/reference/summary.mkinfit.html | 4 | ||||
| -rw-r--r-- | docs/reference/transform_odeparms.html | 22 | 
15 files changed, 92 insertions, 91 deletions
| diff --git a/docs/articles/FOCUS_D.html b/docs/articles/FOCUS_D.html index 33424756..38e59d9d 100644 --- a/docs/articles/FOCUS_D.html +++ b/docs/articles/FOCUS_D.html @@ -85,7 +85,7 @@        <h1>Example evaluation of FOCUS Example Dataset D</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-02-21</h4> +            <h4 class="date">2019-02-22</h4>        <div class="hidden name"><code>FOCUS_D.Rmd</code></div> @@ -163,8 +163,8 @@  <div class="sourceCode" id="cb10"><pre class="sourceCode r"><code class="sourceCode r"><a class="sourceLine" id="cb10-1" data-line-number="1"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(fit)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:41 2019  -## Date of summary: Thu Feb 21 16:13:41 2019  +## Date of fit:     Fri Feb 22 09:51:20 2019  +## Date of summary: Fri Feb 22 09:51:21 2019   ##   ## Equations:  ## d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -172,7 +172,7 @@  ##   ## Model predictions using solution type deSolve   ##  -## Fitted with method Port using 153 model solutions performed in 0.697 s +## Fitted with method Port using 153 model solutions performed in 0.693 s  ##   ## Weighting: none  ##  diff --git a/docs/articles/FOCUS_L.html b/docs/articles/FOCUS_L.html index b422b315..13131315 100644 --- a/docs/articles/FOCUS_L.html +++ b/docs/articles/FOCUS_L.html @@ -85,7 +85,7 @@        <h1>Example evaluation of FOCUS Laboratory Data L1 to L3</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-02-21</h4> +            <h4 class="date">2019-02-22</h4>        <div class="hidden name"><code>FOCUS_L.Rmd</code></div> @@ -111,8 +111,8 @@  <a class="sourceLine" id="cb2-2" data-line-number="2"><span class="kw"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></span>(m.L1.SFO)</a></code></pre></div>  <pre><code>## mkin version used for fitting:    0.9.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:43 2019  -## Date of summary: Thu Feb 21 16:13:43 2019  +## Date of fit:     Fri Feb 22 09:51:22 2019  +## Date of summary: Fri Feb 22 09:51:22 2019   ##   ## Equations:  ## d_parent/dt = - k_parent_sink * parent @@ -202,15 +202,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"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></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.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:45 2019  -## Date of summary: Thu Feb 21 16:13:45 2019  +## Date of fit:     Fri Feb 22 09:51:24 2019  +## Date of summary: Fri Feb 22 09:51:24 2019   ##   ## 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.509 s +## Fitted with method Port using 611 model solutions performed in 1.515 s  ##   ## Weighting: none  ##  @@ -297,15 +297,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"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></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.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:45 2019  -## Date of summary: Thu Feb 21 16:13:45 2019  +## Date of fit:     Fri Feb 22 09:51:25 2019  +## Date of summary: Fri Feb 22 09:51:25 2019   ##   ## 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.197 s +## Fitted with method Port using 81 model solutions performed in 0.198 s  ##   ## Weighting: none  ##  @@ -368,8 +368,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"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></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.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:46 2019  -## Date of summary: Thu Feb 21 16:13:46 2019  +## Date of fit:     Fri Feb 22 09:51:26 2019  +## Date of summary: Fri Feb 22 09:51:26 2019   ##   ## Equations:  ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -378,7 +378,7 @@  ##   ## Model predictions using solution type analytical   ##  -## Fitted with method Port using 336 model solutions performed in 0.842 s +## Fitted with method Port using 336 model solutions performed in 0.847 s  ##   ## Weighting: none  ##  @@ -460,8 +460,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"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></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.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:47 2019  -## Date of summary: Thu Feb 21 16:13:48 2019  +## Date of fit:     Fri Feb 22 09:51:27 2019  +## Date of summary: Fri Feb 22 09:51:27 2019   ##   ## Equations:  ## d_parent/dt = - ((k1 * g * exp(-k1 * time) + k2 * (1 - g) * @@ -470,7 +470,7 @@  ##   ## Model predictions using solution type analytical   ##  -## Fitted with method Port using 137 model solutions performed in 0.345 s +## Fitted with method Port using 137 model solutions performed in 0.347 s  ##   ## Weighting: none  ##  @@ -561,15 +561,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"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></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.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:48 2019  -## Date of summary: Thu Feb 21 16:13:48 2019  +## Date of fit:     Fri Feb 22 09:51:27 2019  +## Date of summary: Fri Feb 22 09:51:28 2019   ##   ## 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.11 s +## Fitted with method Port using 46 model solutions performed in 0.112 s  ##   ## Weighting: none  ##  @@ -621,15 +621,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"><a href="https://www.rdocumentation.org/packages/base/topics/summary">summary</a></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.48.1   ## R version used for fitting:       3.5.2  -## Date of fit:     Thu Feb 21 16:13:48 2019  -## Date of summary: Thu Feb 21 16:13:48 2019  +## Date of fit:     Fri Feb 22 09:51:28 2019  +## Date of summary: Fri Feb 22 09:51:28 2019   ##   ## 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.163 s +## Fitted with method Port using 66 model solutions performed in 0.165 s  ##   ## Weighting: none  ##  diff --git a/docs/articles/mkin.html b/docs/articles/mkin.html index 8f770680..9baa44e4 100644 --- a/docs/articles/mkin.html +++ b/docs/articles/mkin.html @@ -85,7 +85,7 @@        <h1>Introduction to mkin</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-02-21</h4> +            <h4 class="date">2019-02-22</h4>        <div class="hidden name"><code>mkin.Rmd</code></div> diff --git a/docs/articles/twa.html b/docs/articles/twa.html index 2dbe2a32..8c340557 100644 --- a/docs/articles/twa.html +++ b/docs/articles/twa.html @@ -85,7 +85,7 @@        <h1>Calculation of time weighted average concentrations with mkin</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-02-21</h4> +            <h4 class="date">2019-02-22</h4>        <div class="hidden name"><code>twa.Rmd</code></div> diff --git a/docs/articles/web_only/FOCUS_Z.html b/docs/articles/web_only/FOCUS_Z.html index b4fa25ac..b1e2811c 100644 --- a/docs/articles/web_only/FOCUS_Z.html +++ b/docs/articles/web_only/FOCUS_Z.html @@ -85,7 +85,7 @@        <h1>Example evaluation of FOCUS dataset Z</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-02-21</h4> +            <h4 class="date">2019-02-22</h4>        <div class="hidden name"><code>FOCUS_Z.Rmd</code></div> diff --git a/docs/articles/web_only/compiled_models.html b/docs/articles/web_only/compiled_models.html index 8f13b969..e9f8fa99 100644 --- a/docs/articles/web_only/compiled_models.html +++ b/docs/articles/web_only/compiled_models.html @@ -85,7 +85,7 @@        <h1>Performance benefit by using compiled model definitions in mkin</h1>                          <h4 class="author">Johannes Ranke</h4> -            <h4 class="date">2019-02-21</h4> +            <h4 class="date">2019-02-22</h4>        <div class="hidden name"><code>compiled_models.Rmd</code></div> @@ -126,9 +126,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.347    1.000     2.346        0 -## 1 deSolve, not compiled            3  17.693    7.539    17.684        0 -## 2      Eigenvalue based            3   2.907    1.239     2.905        0 +## 3     deSolve, compiled            3   2.336    1.000     2.335        0 +## 1 deSolve, not compiled            3  17.610    7.539    17.602        0 +## 2      Eigenvalue based            3   2.899    1.241     2.897        0  ##   user.child sys.child  ## 3          0         0  ## 1          0         0 @@ -157,8 +157,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.278    1.000     4.276        0 -## 1 deSolve, not compiled            3  37.855    8.849    37.833        0 +## 2     deSolve, compiled            3   4.122    1.000     4.119        0 +## 1 deSolve, not compiled            3  37.359    9.063    37.343        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 8e018e96..20949a8f 100644 --- a/docs/reference/Extract.mmkin.html +++ b/docs/reference/Extract.mmkin.html @@ -280,7 +280,7 @@  #>   #> $time  #>        User      System verstrichen  -#>       0.198       0.000       0.198  +#>       0.197       0.000       0.197   #>   #> $mkinmod  #> <mkinmod> model generated with @@ -469,8 +469,8 @@  #>     }  #>     return(mC)  #> } -#> <bytecode: 0x55555920cdf0> -#> <environment: 0x5555562c5500> +#> <bytecode: 0x55555920cf58> +#> <environment: 0x5555560a01f8>  #>   #> $cost_notrans  #> function (P)  @@ -492,8 +492,8 @@  #>         scaleVar = scaleVar)  #>     return(mC)  #> } -#> <bytecode: 0x55555a399838> -#> <environment: 0x5555562c5500> +#> <bytecode: 0x55555a322750> +#> <environment: 0x5555560a01f8>  #>   #> $hessian_notrans  #>                   parent_0 k_parent_sink @@ -560,7 +560,7 @@  #> 99.17407   #>   #> $date -#> [1] "Thu Feb 21 16:11:47 2019" +#> [1] "Fri Feb 22 09:49:27 2019"  #>   #> $version  #> [1] "0.9.48.1" diff --git a/docs/reference/logistic.solution.html b/docs/reference/logistic.solution.html index 1894ed0e..728fbaa9 100644 --- a/docs/reference/logistic.solution.html +++ b/docs/reference/logistic.solution.html @@ -32,7 +32,7 @@  <meta property="og:title" content="Logistic kinetics — logistic.solution" /> -<meta property="og:description" content="Function describing exponential decline from a defined starting value, with  +<meta property="og:description" content="Function describing exponential decline from a defined starting value, with    an increasing rate constant, supposedly caused by microbial growth" />  <meta name="twitter:card" content="summary" /> @@ -126,7 +126,7 @@      <div class="ref-description"> -    <p>Function describing exponential decline from a defined starting value, with  +    <p>Function describing exponential decline from a defined starting value, with    an increasing rate constant, supposedly caused by microbial growth</p>      </div> @@ -211,7 +211,8 @@  #> parent_0 110.9190170  #> kmax       0.1229682  #> k0        65.4803698 -#> r          3.3474197</div></pre> +#> r          3.3474197</div><div class='input'>  <span class='fu'><a href='endpoints.html'>endpoints</a></span>(<span class='no'>m</span>)$<span class='no'>distimes</span></div><div class='output co'>#>            DT50     DT90  DT50_k0 DT50_kmax +#> parent 36.86533 62.41511 4297.854  10.83349</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 7d865dcf..46de4255 100644 --- a/docs/reference/mccall81_245T.html +++ b/docs/reference/mccall81_245T.html @@ -160,8 +160,8 @@                           <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   #> R version used for fitting:       3.5.2  -#> Date of fit:     Thu Feb 21 16:12:08 2019  -#> Date of summary: Thu Feb 21 16:12:08 2019  +#> Date of fit:     Fri Feb 22 09:49:48 2019  +#> Date of summary: Fri Feb 22 09:49:48 2019   #>   #> Equations:  #> d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245 @@ -171,7 +171,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 574 model solutions performed in 3.846 s +#> Fitted with method Port using 574 model solutions performed in 3.837 s  #>   #> Weighting: none  #>  @@ -249,8 +249,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:     Thu Feb 21 16:12:10 2019  -#> Date of summary: Thu Feb 21 16:12:10 2019  +#> Date of fit:     Fri Feb 22 09:49:50 2019  +#> Date of summary: Fri Feb 22 09:49:50 2019   #>   #> Equations:  #> d_T245/dt = - k_T245_sink * T245 - k_T245_phenol * T245 @@ -260,7 +260,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 246 model solutions performed in 1.602 s +#> Fitted with method Port using 246 model solutions performed in 1.611 s  #>   #> Weighting: none  #>  diff --git a/docs/reference/mkinfit.html b/docs/reference/mkinfit.html index 5f57189c..addb23e5 100644 --- a/docs/reference/mkinfit.html +++ b/docs/reference/mkinfit.html @@ -438,15 +438,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:     Thu Feb 21 16:12:13 2019  -#> Date of summary: Thu Feb 21 16:12:13 2019  +#> Date of fit:     Fri Feb 22 09:49:53 2019  +#> Date of summary: Fri Feb 22 09:49:53 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.16 s +#> Fitted with method Port using 64 model solutions performed in 0.159 s  #>   #> Weighting: none  #>  @@ -515,7 +515,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.035       0.004       1.040 </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.015       0.000       1.016 </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  @@ -590,7 +590,7 @@  #> Model cost at call  146 :  371.2134   #> Optimisation by method Port successfully terminated.  #>        User      System verstrichen  -#>       0.819       0.000       0.819 </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.821       0.000       0.822 </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  @@ -628,8 +628,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:     Thu Feb 21 16:12:25 2019  -#> Date of summary: Thu Feb 21 16:12:25 2019  +#> Date of fit:     Fri Feb 22 09:50:05 2019  +#> Date of summary: Fri Feb 22 09:50:05 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent @@ -637,7 +637,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 186 model solutions performed in 0.877 s +#> Fitted with method Port using 186 model solutions performed in 0.853 s  #>   #> Weighting: none  #>  @@ -745,8 +745,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:     Thu Feb 21 16:12:28 2019  -#> Date of summary: Thu Feb 21 16:12:28 2019  +#> Date of fit:     Fri Feb 22 09:50:07 2019  +#> Date of summary: Fri Feb 22 09:50:07 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent @@ -754,7 +754,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 551 model solutions performed in 2.574 s +#> Fitted with method Port using 551 model solutions performed in 2.535 s  #>   #> Weighting: none  #>  @@ -867,8 +867,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:     Thu Feb 21 16:12:29 2019  -#> Date of summary: Thu Feb 21 16:12:29 2019  +#> Date of fit:     Fri Feb 22 09:50:08 2019  +#> Date of summary: Fri Feb 22 09:50:08 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent @@ -876,7 +876,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 155 model solutions performed in 0.756 s +#> Fitted with method Port using 155 model solutions performed in 0.717 s  #>   #> Weighting: mean  #>  @@ -985,8 +985,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:     Thu Feb 21 16:12:30 2019  -#> Date of summary: Thu Feb 21 16:12:30 2019  +#> Date of fit:     Fri Feb 22 09:50:09 2019  +#> Date of summary: Fri Feb 22 09:50:09 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent @@ -994,7 +994,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 174 model solutions performed in 0.864 s +#> Fitted with method Port using 174 model solutions performed in 0.796 s  #>   #> Weighting: manual  #>  @@ -1105,8 +1105,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:     Thu Feb 21 16:12:31 2019  -#> Date of summary: Thu Feb 21 16:12:31 2019  +#> Date of fit:     Fri Feb 22 09:50:11 2019  +#> Date of summary: Fri Feb 22 09:50:11 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent @@ -1114,7 +1114,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 270 model solutions performed in 1.306 s +#> Fitted with method Port using 270 model solutions performed in 1.325 s  #>   #> Weighting: manual  #>  @@ -1223,8 +1223,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:     Thu Feb 21 16:12:35 2019  -#> Date of summary: Thu Feb 21 16:12:35 2019  +#> Date of fit:     Fri Feb 22 09:50:14 2019  +#> Date of summary: Fri Feb 22 09:50:14 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent @@ -1232,7 +1232,7 @@  #>   #> Model predictions using solution type deSolve   #>  -#> Fitted with method Port using 692 model solutions performed in 3.309 s +#> Fitted with method Port using 692 model solutions performed in 3.303 s  #>   #> Weighting: manual  #>  diff --git a/docs/reference/mkinmod.html b/docs/reference/mkinmod.html index 79eb89d3..b2f290d1 100644 --- a/docs/reference/mkinmod.html +++ b/docs/reference/mkinmod.html @@ -231,7 +231,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 file23f474fcf31d.c 2> file23f474fcf31d.c.err.txt  +#>  /usr/lib/R/bin/R CMD SHLIB file4d9c2c394c1.c 2> file4d9c2c394c1.c.err.txt   #> Program source:  #>   1: #include <R.h>  #>   2:  diff --git a/docs/reference/mkinpredict.html b/docs/reference/mkinpredict.html index 02b809a0..6f789fa4 100644 --- a/docs/reference/mkinpredict.html +++ b/docs/reference/mkinpredict.html @@ -325,17 +325,17 @@                  <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.003       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>(      <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  #> 201   20 4.978707 27.46227</div><div class='output co'>#>        User      System verstrichen  -#>       0.002       0.000       0.002 </div><div class='input'>  <span class='fu'><a href='https://www.rdocumentation.org/packages/base/topics/system.time'>system.time</a></span>( +#>       0.001       0.000       0.002 </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='kw'>use_compiled</span> <span class='kw'>=</span> <span class='fl'>FALSE</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.039       0.000       0.039 </div><div class='input'> +#>       0.042       0.000       0.042 </div><div class='input'>    </div><div class='input'>    <span class='co'># Predict from a fitted model</span>      <span class='no'>f</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_C</span>)</div><div class='output co'>#> Model cost at call  1 :  552.5739   #> Model cost at call  3 :  552.5739  diff --git a/docs/reference/mmkin.html b/docs/reference/mmkin.html index 71c347fd..73a25ef2 100644 --- a/docs/reference/mmkin.html +++ b/docs/reference/mmkin.html @@ -191,8 +191,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.051       0.032       7.366 </div><div class='input'><span class='no'>time_1</span></div><div class='output co'>#>        User      System verstrichen  -#>      23.290       0.000      23.305 </div><div class='input'> +#>       0.040       0.047       7.314 </div><div class='input'><span class='no'>time_1</span></div><div class='output co'>#>        User      System verstrichen  +#>      22.751       0.000      22.766 </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/summary.mkinfit.html b/docs/reference/summary.mkinfit.html index 3b55635c..1543c328 100644 --- a/docs/reference/summary.mkinfit.html +++ b/docs/reference/summary.mkinfit.html @@ -208,8 +208,8 @@      <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:     Thu Feb 21 16:13:27 2019  -#> Date of summary: Thu Feb 21 16:13:27 2019  +#> Date of fit:     Fri Feb 22 09:51:06 2019  +#> Date of summary: Fri Feb 22 09:51:06 2019   #>   #> Equations:  #> d_parent/dt = - k_parent_sink * parent diff --git a/docs/reference/transform_odeparms.html b/docs/reference/transform_odeparms.html index d15b0213..65a6b4ee 100644 --- a/docs/reference/transform_odeparms.html +++ b/docs/reference/transform_odeparms.html @@ -202,8 +202,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:     Thu Feb 21 16:13:35 2019  -#> Date of summary: Thu Feb 21 16:13:35 2019  +#> Date of fit:     Fri Feb 22 09:51:14 2019  +#> Date of summary: Fri Feb 22 09:51:14 2019   #>   #> Equations:  #> d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -211,7 +211,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.782 s +#> Fitted with method Port using 153 model solutions performed in 0.775 s  #>   #> Weighting: none  #>  @@ -278,8 +278,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:     Thu Feb 21 16:13:37 2019  -#> Date of summary: Thu Feb 21 16:13:37 2019  +#> Date of fit:     Fri Feb 22 09:51:16 2019  +#> Date of summary: Fri Feb 22 09:51:16 2019   #>   #> Equations:  #> d_parent/dt = - k_parent_sink * parent - k_parent_m1 * parent @@ -287,7 +287,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.579 s +#> Fitted with method Port using 350 model solutions performed in 1.584 s  #>   #> Weighting: none  #>  @@ -366,8 +366,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:     Thu Feb 21 16:13:38 2019  -#> Date of summary: Thu Feb 21 16:13:38 2019  +#> Date of fit:     Fri Feb 22 09:51:17 2019  +#> Date of summary: Fri Feb 22 09:51:17 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent @@ -375,7 +375,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.859 s +#> Fitted with method Port using 186 model solutions performed in 0.858 s  #>   #> Weighting: none  #>  @@ -450,8 +450,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:     Thu Feb 21 16:13:39 2019  -#> Date of summary: Thu Feb 21 16:13:39 2019  +#> Date of fit:     Fri Feb 22 09:51:18 2019  +#> Date of summary: Fri Feb 22 09:51:18 2019   #>   #> Equations:  #> d_parent/dt = - k_parent * parent | 
