From 9ced70b6535ec58c16605fe95b5dce27eef3db05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Biecek?= Date: Mon, 20 May 2019 23:50:36 +0200 Subject: [PATCH 1/2] the row filtering is removed as variable names with ` cannot be reproduced --- R/ggforest.R | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/R/ggforest.R b/R/ggforest.R index 0b20796..4d9d064 100644 --- a/R/ggforest.R +++ b/R/ggforest.R @@ -47,9 +47,9 @@ ggforest <- function(model, data = NULL, # get data and variables/terms from cox model data <- .get_data(model, data = data) terms <- attr(model$terms, "dataClasses")[-1] - terms <- terms[intersect(names(terms), - gsub(rownames(anova(model))[-1], pattern = "`", replacement = ""))] - +# terms <- terms[intersect(names(terms), +# gsub(rownames(anova(model))[-1], pattern = "`", replacement = ""))] + # use broom to get some required statistics coef <- as.data.frame(tidy(model)) gmodel <- glance(model) @@ -62,12 +62,12 @@ ggforest <- function(model, data = NULL, cbind(var = var, adf, pos = 1:nrow(adf)) } else if (terms[i] == "numeric") { - data.frame(var = var, Var1 = "", Freq = nrow(data), + data.frame(var = var, Var1 = "", Freq = nrow(data), pos = 1) } else { vars = grep(paste0("^", var, "*."), coef$term, value=TRUE) - data.frame(var =vars , Var1 = "", Freq = nrow(data), + data.frame(var =vars , Var1 = "", Freq = nrow(data), pos = seq_along(vars)) } }) From 27dbcf524c8b70ee4b0ac0866a3f51aefec80c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Biecek?= Date: Mon, 20 May 2019 23:52:37 +0200 Subject: [PATCH 2/2] added link to #388 --- R/ggforest.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/ggforest.R b/R/ggforest.R index 4d9d064..cbc69a1 100644 --- a/R/ggforest.R +++ b/R/ggforest.R @@ -47,6 +47,7 @@ ggforest <- function(model, data = NULL, # get data and variables/terms from cox model data <- .get_data(model, data = data) terms <- attr(model$terms, "dataClasses")[-1] +# removed as requested in #388 # terms <- terms[intersect(names(terms), # gsub(rownames(anova(model))[-1], pattern = "`", replacement = ""))] @@ -67,7 +68,7 @@ ggforest <- function(model, data = NULL, } else { vars = grep(paste0("^", var, "*."), coef$term, value=TRUE) - data.frame(var =vars , Var1 = "", Freq = nrow(data), + data.frame(var = vars, Var1 = "", Freq = nrow(data), pos = seq_along(vars)) } })