diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/news/index.html | 1 | ||||
| -rw-r--r-- | docs/pkgdown.yml | 2 | ||||
| -rw-r--r-- | docs/reference/Rplot001.png | bin | 1011 -> 27637 bytes | |||
| -rw-r--r-- | docs/reference/Rplot002.png | bin | 16524 -> 59394 bytes | |||
| -rw-r--r-- | docs/reference/Rplot003.png | bin | 15401 -> 33192 bytes | |||
| -rw-r--r-- | docs/reference/Rplot004.png | bin | 10689 -> 23509 bytes | |||
| -rw-r--r-- | docs/reference/Rplot005.png | bin | 19483 -> 23509 bytes | |||
| -rw-r--r-- | docs/reference/Rplot006.png | bin | 24302 -> 22129 bytes | |||
| -rw-r--r-- | docs/reference/mmkin-1.png | bin | 111569 -> 110844 bytes | |||
| -rw-r--r-- | docs/reference/mmkin-2.png | bin | 108319 -> 107612 bytes | |||
| -rw-r--r-- | docs/reference/mmkin-3.png | bin | 96596 -> 96248 bytes | |||
| -rw-r--r-- | docs/reference/mmkin-4.png | bin | 67345 -> 66653 bytes | |||
| -rw-r--r-- | docs/reference/mmkin-5.png | bin | 65269 -> 65046 bytes | |||
| -rw-r--r-- | docs/reference/mmkin.html | 9 | ||||
| -rw-r--r-- | docs/reference/nlme-1.png | bin | 70276 -> 70244 bytes | |||
| -rw-r--r-- | docs/reference/plot.mixed.mmkin-1.png | bin | 85433 -> 84976 bytes |
16 files changed, 7 insertions, 5 deletions
diff --git a/docs/news/index.html b/docs/news/index.html index fae6503a..2905c120 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -147,6 +147,7 @@ <ul> <li><p>All plotting functions setting graphical parameters: Use on.exit() for resetting graphical parameters</p></li> <li><p>‘plot.mkinfit’: Use xlab and xlim for the residual plot if show_residuals is TRUE</p></li> +<li><p>‘mmkin’: Use cores = 1 per default on Windows to make it easier for first time users</p></li> </ul> </div> <div id="mkin-103-2021-02-15" class="section level1"> diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index df454e62..3f97ea94 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -10,7 +10,7 @@ articles: web_only/NAFTA_examples: NAFTA_examples.html web_only/benchmarks: benchmarks.html web_only/compiled_models: compiled_models.html -last_built: 2021-03-31T17:15Z +last_built: 2021-04-20T14:34Z urls: reference: https://pkgdown.jrwb.de/mkin/reference article: https://pkgdown.jrwb.de/mkin/articles diff --git a/docs/reference/Rplot001.png b/docs/reference/Rplot001.png Binary files differindex 17a35806..49fb9af1 100644 --- a/docs/reference/Rplot001.png +++ b/docs/reference/Rplot001.png diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png Binary files differindex 808f1968..745d583d 100644 --- a/docs/reference/Rplot002.png +++ b/docs/reference/Rplot002.png diff --git a/docs/reference/Rplot003.png b/docs/reference/Rplot003.png Binary files differindex 97f650e2..eba202e9 100644 --- a/docs/reference/Rplot003.png +++ b/docs/reference/Rplot003.png diff --git a/docs/reference/Rplot004.png b/docs/reference/Rplot004.png Binary files differindex 21ad6783..a4f878c8 100644 --- a/docs/reference/Rplot004.png +++ b/docs/reference/Rplot004.png diff --git a/docs/reference/Rplot005.png b/docs/reference/Rplot005.png Binary files differindex 4828f5b2..a4f878c8 100644 --- a/docs/reference/Rplot005.png +++ b/docs/reference/Rplot005.png diff --git a/docs/reference/Rplot006.png b/docs/reference/Rplot006.png Binary files differindex 4aed2c87..ff8a5d83 100644 --- a/docs/reference/Rplot006.png +++ b/docs/reference/Rplot006.png diff --git a/docs/reference/mmkin-1.png b/docs/reference/mmkin-1.png Binary files differindex 26586ab9..f6bb2131 100644 --- a/docs/reference/mmkin-1.png +++ b/docs/reference/mmkin-1.png diff --git a/docs/reference/mmkin-2.png b/docs/reference/mmkin-2.png Binary files differindex dbcdd8ee..50102a3d 100644 --- a/docs/reference/mmkin-2.png +++ b/docs/reference/mmkin-2.png diff --git a/docs/reference/mmkin-3.png b/docs/reference/mmkin-3.png Binary files differindex 80245fc6..9aa7f0db 100644 --- a/docs/reference/mmkin-3.png +++ b/docs/reference/mmkin-3.png diff --git a/docs/reference/mmkin-4.png b/docs/reference/mmkin-4.png Binary files differindex 328aa564..f4f413d1 100644 --- a/docs/reference/mmkin-4.png +++ b/docs/reference/mmkin-4.png diff --git a/docs/reference/mmkin-5.png b/docs/reference/mmkin-5.png Binary files differindex 9ce5e919..48ab2c50 100644 --- a/docs/reference/mmkin-5.png +++ b/docs/reference/mmkin-5.png diff --git a/docs/reference/mmkin.html b/docs/reference/mmkin.html index c73d14bf..caba300e 100644 --- a/docs/reference/mmkin.html +++ b/docs/reference/mmkin.html @@ -155,7 +155,7 @@ datasets specified in its first two arguments.</p> <pre class="usage"><span class='fu'>mmkin</span><span class='op'>(</span> models <span class='op'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span><span class='op'>(</span><span class='st'>"SFO"</span>, <span class='st'>"FOMC"</span>, <span class='st'>"DFOP"</span><span class='op'>)</span>, <span class='va'>datasets</span>, - cores <span class='op'>=</span> <span class='fu'>parallel</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/r/parallel/detectCores.html'>detectCores</a></span><span class='op'>(</span><span class='op'>)</span>, + cores <span class='op'>=</span> <span class='kw'>if</span> <span class='op'>(</span><span class='fu'><a href='https://rdrr.io/r/base/Sys.info.html'>Sys.info</a></span><span class='op'>(</span><span class='op'>)</span><span class='op'>[</span><span class='st'>"sysname"</span><span class='op'>]</span> <span class='op'>==</span> <span class='st'>"Windows"</span><span class='op'>)</span> <span class='fl'>1</span> <span class='kw'>else</span> <span class='fu'>parallel</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/r/parallel/detectCores.html'>detectCores</a></span><span class='op'>(</span><span class='op'>)</span>, cluster <span class='op'>=</span> <span class='cn'>NULL</span>, <span class='va'>...</span> <span class='op'>)</span> @@ -183,7 +183,8 @@ data for <code><a href='mkinfit.html'>mkinfit</a></code>.</p></td> is only used when the <code>cluster</code> argument is <code>NULL</code>. On Windows machines, cores > 1 is not supported, you need to use the <code>cluster</code> argument to use multiple logical processors. Per default, all cores -detected by <code><a href='https://rdrr.io/r/parallel/detectCores.html'>parallel::detectCores()</a></code> are used.</p></td> +detected by <code><a href='https://rdrr.io/r/parallel/detectCores.html'>parallel::detectCores()</a></code> are used, except on Windows where +the default is 1.</p></td> </tr> <tr> <th>cluster</th> @@ -234,9 +235,9 @@ plotting.</p></div> <span class='va'>time_default</span> </div><div class='output co'>#> user system elapsed -#> 5.387 0.413 1.864 </div><div class='input'><span class='va'>time_1</span> +#> 4.656 0.403 1.734 </div><div class='input'><span class='va'>time_1</span> </div><div class='output co'>#> user system elapsed -#> 5.786 0.008 5.794 </div><div class='input'> +#> 5.627 0.004 5.631 </div><div class='input'> <span class='fu'><a href='endpoints.html'>endpoints</a></span><span class='op'>(</span><span class='va'>fits.0</span><span class='op'>[[</span><span class='st'>"SFO_lin"</span>, <span class='fl'>2</span><span class='op'>]</span><span class='op'>]</span><span class='op'>)</span> </div><div class='output co'>#> $ff #> parent_M1 parent_sink M1_M2 M1_sink diff --git a/docs/reference/nlme-1.png b/docs/reference/nlme-1.png Binary files differindex cca4ce0a..c41adc27 100644 --- a/docs/reference/nlme-1.png +++ b/docs/reference/nlme-1.png diff --git a/docs/reference/plot.mixed.mmkin-1.png b/docs/reference/plot.mixed.mmkin-1.png Binary files differindex 2224d96e..65660abe 100644 --- a/docs/reference/plot.mixed.mmkin-1.png +++ b/docs/reference/plot.mixed.mmkin-1.png |
