aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2021-04-21 13:11:47 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2021-04-21 13:11:47 +0200
commitc74b79c983fe9fc872bac1262040e82f16049477 (patch)
treea071ede8d02b1e1db07527a14afb2313cba9f69e /docs
parent3a5463672c297b37c3c9135c8b144c48744c05d0 (diff)
Version 1.0.4 published yesterdayv1.0.4
Diffstat (limited to 'docs')
-rw-r--r--docs/news/index.html1
-rw-r--r--docs/pkgdown.yml2
-rw-r--r--docs/reference/Rplot001.pngbin1011 -> 27637 bytes
-rw-r--r--docs/reference/Rplot002.pngbin16524 -> 59394 bytes
-rw-r--r--docs/reference/Rplot003.pngbin15401 -> 33192 bytes
-rw-r--r--docs/reference/Rplot004.pngbin10689 -> 23509 bytes
-rw-r--r--docs/reference/Rplot005.pngbin19483 -> 23509 bytes
-rw-r--r--docs/reference/Rplot006.pngbin24302 -> 22129 bytes
-rw-r--r--docs/reference/mmkin-1.pngbin111569 -> 110844 bytes
-rw-r--r--docs/reference/mmkin-2.pngbin108319 -> 107612 bytes
-rw-r--r--docs/reference/mmkin-3.pngbin96596 -> 96248 bytes
-rw-r--r--docs/reference/mmkin-4.pngbin67345 -> 66653 bytes
-rw-r--r--docs/reference/mmkin-5.pngbin65269 -> 65046 bytes
-rw-r--r--docs/reference/mmkin.html9
-rw-r--r--docs/reference/nlme-1.pngbin70276 -> 70244 bytes
-rw-r--r--docs/reference/plot.mixed.mmkin-1.pngbin85433 -> 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
index 17a35806..49fb9af1 100644
--- a/docs/reference/Rplot001.png
+++ b/docs/reference/Rplot001.png
Binary files differ
diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png
index 808f1968..745d583d 100644
--- a/docs/reference/Rplot002.png
+++ b/docs/reference/Rplot002.png
Binary files differ
diff --git a/docs/reference/Rplot003.png b/docs/reference/Rplot003.png
index 97f650e2..eba202e9 100644
--- a/docs/reference/Rplot003.png
+++ b/docs/reference/Rplot003.png
Binary files differ
diff --git a/docs/reference/Rplot004.png b/docs/reference/Rplot004.png
index 21ad6783..a4f878c8 100644
--- a/docs/reference/Rplot004.png
+++ b/docs/reference/Rplot004.png
Binary files differ
diff --git a/docs/reference/Rplot005.png b/docs/reference/Rplot005.png
index 4828f5b2..a4f878c8 100644
--- a/docs/reference/Rplot005.png
+++ b/docs/reference/Rplot005.png
Binary files differ
diff --git a/docs/reference/Rplot006.png b/docs/reference/Rplot006.png
index 4aed2c87..ff8a5d83 100644
--- a/docs/reference/Rplot006.png
+++ b/docs/reference/Rplot006.png
Binary files differ
diff --git a/docs/reference/mmkin-1.png b/docs/reference/mmkin-1.png
index 26586ab9..f6bb2131 100644
--- a/docs/reference/mmkin-1.png
+++ b/docs/reference/mmkin-1.png
Binary files differ
diff --git a/docs/reference/mmkin-2.png b/docs/reference/mmkin-2.png
index dbcdd8ee..50102a3d 100644
--- a/docs/reference/mmkin-2.png
+++ b/docs/reference/mmkin-2.png
Binary files differ
diff --git a/docs/reference/mmkin-3.png b/docs/reference/mmkin-3.png
index 80245fc6..9aa7f0db 100644
--- a/docs/reference/mmkin-3.png
+++ b/docs/reference/mmkin-3.png
Binary files differ
diff --git a/docs/reference/mmkin-4.png b/docs/reference/mmkin-4.png
index 328aa564..f4f413d1 100644
--- a/docs/reference/mmkin-4.png
+++ b/docs/reference/mmkin-4.png
Binary files differ
diff --git a/docs/reference/mmkin-5.png b/docs/reference/mmkin-5.png
index 9ce5e919..48ab2c50 100644
--- a/docs/reference/mmkin-5.png
+++ b/docs/reference/mmkin-5.png
Binary files differ
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 &gt; 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'>#&gt; user system elapsed
-#&gt; 5.387 0.413 1.864 </div><div class='input'><span class='va'>time_1</span>
+#&gt; 4.656 0.403 1.734 </div><div class='input'><span class='va'>time_1</span>
</div><div class='output co'>#&gt; user system elapsed
-#&gt; 5.786 0.008 5.794 </div><div class='input'>
+#&gt; 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'>#&gt; $ff
#&gt; parent_M1 parent_sink M1_M2 M1_sink
diff --git a/docs/reference/nlme-1.png b/docs/reference/nlme-1.png
index cca4ce0a..c41adc27 100644
--- a/docs/reference/nlme-1.png
+++ b/docs/reference/nlme-1.png
Binary files differ
diff --git a/docs/reference/plot.mixed.mmkin-1.png b/docs/reference/plot.mixed.mmkin-1.png
index 2224d96e..65660abe 100644
--- a/docs/reference/plot.mixed.mmkin-1.png
+++ b/docs/reference/plot.mixed.mmkin-1.png
Binary files differ

Contact - Imprint