From f3f415520c89f9d8526bf6fadc862ebd44be220d Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 17 Nov 2016 18:14:32 +0100 Subject: Remove trailing whitespace, clean headers Also ignore test.R in the top level directory, as it is not meant to be public --- R/mmkin.R | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'R/mmkin.R') diff --git a/R/mmkin.R b/R/mmkin.R index be4526af..63542f4f 100644 --- a/R/mmkin.R +++ b/R/mmkin.R @@ -19,10 +19,10 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see -mmkin <- function(models = c("SFO", "FOMC", "DFOP"), datasets, - cores = round(detectCores()/2), cluster = NULL, ...) +mmkin <- function(models = c("SFO", "FOMC", "DFOP"), datasets, + cores = round(detectCores()/2), cluster = NULL, ...) { - parent_models_available = c("SFO", "FOMC", "DFOP", "HS", "SFORB", "IORE") + parent_models_available = c("SFO", "FOMC", "DFOP", "HS", "SFORB", "IORE") n.m <- length(models) n.d <- length(datasets) n.fits <- n.m * n.d @@ -32,10 +32,10 @@ mmkin <- function(models = c("SFO", "FOMC", "DFOP"), datasets, if (!all(sapply(models, function(x) inherits(x, "mkinmod")))) { if (!all(models %in% parent_models_available)) { stop("Please supply models as a list of mkinmod objects or a vector combined of\n ", - paste(parent_models_available, collapse = ", ")) + paste(parent_models_available, collapse = ", ")) } else { names(models) <- models - } + } } else { if (is.null(names(models))) names(models) <- as.character(1:n.m) } -- cgit v1.2.1