aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2015-06-25 11:39:20 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2015-06-25 11:43:49 +0200
commite9931e61c253eb9379864b0a4dc7e37e39b6738d (patch)
tree9201c07c9c4309901c174e9f791043da9a93d6a0
parent2d4a28c504f05278f2ddbf39fcad14eff16f15ef (diff)
Fix fitting with parLapply, doc fix
-rw-r--r--R/mmkin.R2
-rw-r--r--man/mmkin.Rd1
2 files changed, 2 insertions, 1 deletions
diff --git a/R/mmkin.R b/R/mmkin.R
index fe9db194..1e1c4a33 100644
--- a/R/mmkin.R
+++ b/R/mmkin.R
@@ -37,7 +37,7 @@ mmkin <- function(models = c("SFO", "FOMC", "DFOP"), datasets,
if (is.null(cluster)) {
results <- mclapply(as.list(1:n.fits), fit_function, mc.cores = cores)
} else {
- results <- parLapply(cluster, list(1:n.fit), fit_function)
+ results <- parLapply(cluster, as.list(1:n.fits), fit_function)
}
attributes(results) <- attributes(fit_indices)
diff --git a/man/mmkin.Rd b/man/mmkin.Rd
index 64e7ae27..0b35738a 100644
--- a/man/mmkin.Rd
+++ b/man/mmkin.Rd
@@ -61,4 +61,5 @@ time_1
endpoints(fits[["SFO_lin", 2]])
}
+}
\keyword{ optimize }

Contact - Imprint