diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-11-12 16:41:10 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-11-12 16:45:53 +0100 |
| commit | f6fc5a050442c60d74a1943fa1181b8338322f30 (patch) | |
| tree | 9a3ff864fc535dc2d5d45791ab7a4189c4087e92 | |
| parent | abe4ba27295389374f3ee53be0638275bd958743 (diff) | |
Model names in lrtest.mmkin, fix for print.mmkin
Fix the display of warnings and errors in print.mmkin, the matrix was
erroneously transposed.
| -rw-r--r-- | R/lrtest.mkinfit.R | 2 | ||||
| -rw-r--r-- | R/mmkin.R | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/R/lrtest.mkinfit.R b/R/lrtest.mkinfit.R index c3f4d38e..cf07154c 100644 --- a/R/lrtest.mkinfit.R +++ b/R/lrtest.mkinfit.R @@ -74,5 +74,7 @@ lrtest.mkinfit <- function(object, object_2 = NULL, ...) { #' @export lrtest.mmkin <- function(object, ...) { if (nrow(object) != 2 | ncol(object) > 1) stop("Only works for a column containing two mkinfit objects") + object[[1, 1]]$mkinmod$name <- rownames(object)[1] + object[[2, 1]]$mkinmod$name <- rownames(object)[2] lrtest(object[[1, 1]], object[[2, 1]]) } @@ -98,6 +98,8 @@ mmkin <- function(models = c("SFO", "FOMC", "DFOP"), datasets, model_index <- w[1] dataset_index <- w[2] res <- try(mkinfit(models[[model_index]], datasets[[dataset_index]], ...)) + if (!inherits(res, "try-error")) res$mkinmod$name <- names(models)[model_index] + return(res) } if (is.null(cluster)) { @@ -156,8 +158,7 @@ print.mmkin <- function(x, ...) { all_summary_warnings <- character() sww <- 0 # Counter for Shapiro-Wilks warnings - x_t <- t(x) # To make lapply work by rows - display <- lapply(x_t, + display <- lapply(x, function(fit) { if (inherits(fit, "try-error")) return("E") sw <- fit$summary_warnings |