fixed tidyverse deprecation (#98)

lcrawlab · Jan 30, 2023 · 6fcf223 · 6fcf223
1 parent d3f360a
commit 6fcf223
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/R/combine_pvalues.R b/R/combine_pvalues.R
@@ -51,7 +51,7 @@ fishers_combined <- function(pvalues, group_col = "id", p_col = "p") {
         group_by(.data[[group_col]]) %>%
         summarize(p = sumlog(.data[[p_col]])) %>%
         mutate(trait = "fisher") %>%
-        relocate(.data[[group_col]], .data[["trait"]], .data[["p"]])
+        relocate(all_of(group_col), all_of("trait"), all_of("p"))
 }
 
 
@@ -93,5 +93,5 @@ harmonic_combined <- function(pvalues, group_col = "id", p_col = "p") {
         group_by(.data[[group_col]]) %>%
         summarize(p = as.numeric(hmp.stat(.data[[p_col]]))) %>%
         mutate(trait = "harmonic") %>%
-        relocate(.data[[group_col]], .data[["trait"]], .data[["p"]])
+        relocate(all_of(group_col), all_of("trait"), all_of("p"))
 }
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -6,6 +6,11 @@
 
 using namespace Rcpp;
 
+#ifdef RCPP_USE_GLOBAL_ROSTREAM
+Rcpp::Rostream<true>&  Rcpp::Rcout = Rcpp::Rcpp_cout_get();
+Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
+#endif
+
 // MAPITCpp
 Rcpp::List MAPITCpp(const arma::mat X, const arma::mat Y, Rcpp::Nullable<Rcpp::NumericMatrix> Z, Rcpp::Nullable<Rcpp::NumericMatrix> C, Rcpp::Nullable<Rcpp::NumericVector> variantIndices, std::string testMethod, int cores, Rcpp::Nullable<Rcpp::NumericMatrix> GeneticSimilarityMatrix);
 RcppExport SEXP _mvMAPIT_MAPITCpp(SEXP XSEXP, SEXP YSEXP, SEXP ZSEXP, SEXP CSEXP, SEXP variantIndicesSEXP, SEXP testMethodSEXP, SEXP coresSEXP, SEXP GeneticSimilarityMatrixSEXP) {