diff options
author | Johannes Ranke <jranke@uni-bremen.de> | 2016-11-17 18:14:32 +0100 |
---|---|---|
committer | Johannes Ranke <jranke@uni-bremen.de> | 2016-11-17 18:23:31 +0100 |
commit | f3f415520c89f9d8526bf6fadc862ebd44be220d (patch) | |
tree | e80d26e3b4f56ebe872888bed8f01a21d49b7ff4 /R/mmkin.R | |
parent | f52fffd9eab13b7902bf767dd9cd7f0e7abf8069 (diff) |
Remove trailing whitespace, clean headers
Also ignore test.R in the top level directory, as it is not meant to
be public
Diffstat (limited to 'R/mmkin.R')
-rw-r--r-- | R/mmkin.R | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -19,10 +19,10 @@ # You should have received a copy of the GNU General Public License along with # this program. If not, see <http://www.gnu.org/licenses/> -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) } |