From c74b79c983fe9fc872bac1262040e82f16049477 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 21 Apr 2021 13:11:47 +0200 Subject: Version 1.0.4 published yesterday --- docs/news/index.html | 1 + docs/pkgdown.yml | 2 +- docs/reference/Rplot001.png | Bin 1011 -> 27637 bytes docs/reference/Rplot002.png | Bin 16524 -> 59394 bytes docs/reference/Rplot003.png | Bin 15401 -> 33192 bytes docs/reference/Rplot004.png | Bin 10689 -> 23509 bytes docs/reference/Rplot005.png | Bin 19483 -> 23509 bytes docs/reference/Rplot006.png | Bin 24302 -> 22129 bytes docs/reference/mmkin-1.png | Bin 111569 -> 110844 bytes docs/reference/mmkin-2.png | Bin 108319 -> 107612 bytes docs/reference/mmkin-3.png | Bin 96596 -> 96248 bytes docs/reference/mmkin-4.png | Bin 67345 -> 66653 bytes docs/reference/mmkin-5.png | Bin 65269 -> 65046 bytes docs/reference/mmkin.html | 9 +++++---- docs/reference/nlme-1.png | Bin 70276 -> 70244 bytes docs/reference/plot.mixed.mmkin-1.png | Bin 85433 -> 84976 bytes 16 files changed, 7 insertions(+), 5 deletions(-) (limited to 'docs') 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 @@
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 Binary files a/docs/reference/Rplot001.png and b/docs/reference/Rplot001.png differ diff --git a/docs/reference/Rplot002.png b/docs/reference/Rplot002.png index 808f1968..745d583d 100644 Binary files a/docs/reference/Rplot002.png and b/docs/reference/Rplot002.png differ diff --git a/docs/reference/Rplot003.png b/docs/reference/Rplot003.png index 97f650e2..eba202e9 100644 Binary files a/docs/reference/Rplot003.png and b/docs/reference/Rplot003.png differ diff --git a/docs/reference/Rplot004.png b/docs/reference/Rplot004.png index 21ad6783..a4f878c8 100644 Binary files a/docs/reference/Rplot004.png and b/docs/reference/Rplot004.png differ diff --git a/docs/reference/Rplot005.png b/docs/reference/Rplot005.png index 4828f5b2..a4f878c8 100644 Binary files a/docs/reference/Rplot005.png and b/docs/reference/Rplot005.png differ diff --git a/docs/reference/Rplot006.png b/docs/reference/Rplot006.png index 4aed2c87..ff8a5d83 100644 Binary files a/docs/reference/Rplot006.png and b/docs/reference/Rplot006.png differ diff --git a/docs/reference/mmkin-1.png b/docs/reference/mmkin-1.png index 26586ab9..f6bb2131 100644 Binary files a/docs/reference/mmkin-1.png and b/docs/reference/mmkin-1.png differ diff --git a/docs/reference/mmkin-2.png b/docs/reference/mmkin-2.png index dbcdd8ee..50102a3d 100644 Binary files a/docs/reference/mmkin-2.png and b/docs/reference/mmkin-2.png differ diff --git a/docs/reference/mmkin-3.png b/docs/reference/mmkin-3.png index 80245fc6..9aa7f0db 100644 Binary files a/docs/reference/mmkin-3.png and b/docs/reference/mmkin-3.png differ diff --git a/docs/reference/mmkin-4.png b/docs/reference/mmkin-4.png index 328aa564..f4f413d1 100644 Binary files a/docs/reference/mmkin-4.png and b/docs/reference/mmkin-4.png differ diff --git a/docs/reference/mmkin-5.png b/docs/reference/mmkin-5.png index 9ce5e919..48ab2c50 100644 Binary files a/docs/reference/mmkin-5.png and b/docs/reference/mmkin-5.png 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.

mmkin(
   models = c("SFO", "FOMC", "DFOP"),
   datasets,
-  cores = parallel::detectCores(),
+  cores = if (Sys.info()["sysname"] == "Windows") 1 else parallel::detectCores(),
   cluster = NULL,
   ...
 )
@@ -183,7 +183,8 @@ data for mkinfit.

is only used when the cluster argument is NULL. On Windows machines, cores > 1 is not supported, you need to use the cluster argument to use multiple logical processors. Per default, all cores -detected by parallel::detectCores() are used.

+detected by parallel::detectCores() are used, except on Windows where +the default is 1.

cluster @@ -234,9 +235,9 @@ plotting.

time_default
#> user system elapsed -#> 5.387 0.413 1.864
time_1 +#> 4.656 0.403 1.734
time_1
#> user system elapsed -#> 5.786 0.008 5.794
+#> 5.627 0.004 5.631
endpoints(fits.0[["SFO_lin", 2]])
#> $ff #> 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 Binary files a/docs/reference/nlme-1.png and b/docs/reference/nlme-1.png differ diff --git a/docs/reference/plot.mixed.mmkin-1.png b/docs/reference/plot.mixed.mmkin-1.png index 2224d96e..65660abe 100644 Binary files a/docs/reference/plot.mixed.mmkin-1.png and b/docs/reference/plot.mixed.mmkin-1.png differ -- cgit v1.2.1