From 3a5463672c297b37c3c9135c8b144c48744c05d0 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 31 Mar 2021 19:42:17 +0200
Subject: Bug fix in plot.mkinfit

In residual plots, use xlab and xlim if appropriate
---
 R/plot.mkinfit.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'R')

diff --git a/R/plot.mkinfit.R b/R/plot.mkinfit.R
index 2e319aae..1d4ea543 100644
--- a/R/plot.mkinfit.R
+++ b/R/plot.mkinfit.R
@@ -278,7 +278,7 @@ plot.mkinfit <- function(x, fit = x,
     if (show_residuals) {
       mkinresplot(fit, obs_vars = row_obs_vars, standardized = standardized,
         pch_obs = pch_obs[row_obs_vars], col_obs = col_obs[row_obs_vars],
-        legend = FALSE, frame = frame, xlab = xlab)
+        legend = FALSE, frame = frame, xlab = xlab, xlim = xlim)
     }
 
     # Show error model plot if requested
-- 
cgit v1.2.1


From c74b79c983fe9fc872bac1262040e82f16049477 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Wed, 21 Apr 2021 13:11:47 +0200
Subject: Version 1.0.4 published yesterday

---
 R/mmkin.R | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'R')

diff --git a/R/mmkin.R b/R/mmkin.R
index 030fb27b..fe04129e 100644
--- a/R/mmkin.R
+++ b/R/mmkin.R
@@ -13,7 +13,8 @@
 #'   is only used when the \code{cluster} argument is \code{NULL}. On Windows
 #'   machines, cores > 1 is not supported, you need to use the \code{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.
 #' @param cluster A cluster as returned by \code{\link{makeCluster}} to be used
 #'   for parallel execution.
 #' @param \dots Further arguments that will be passed to \code{\link{mkinfit}}.
@@ -75,7 +76,7 @@
 #'
 #' @export mmkin
 mmkin <- function(models = c("SFO", "FOMC", "DFOP"), datasets,
-  cores = parallel::detectCores(), cluster = NULL, ...)
+  cores = if (Sys.info()["sysname"] == "Windows") 1 else parallel::detectCores(), cluster = NULL, ...)
 {
   call <- match.call()
   parent_models_available = c("SFO", "FOMC", "DFOP", "HS", "SFORB", "IORE", "logistic")
-- 
cgit v1.2.1