From 12b010062901a7a58bd01758974c266d7384abcf Mon Sep 17 00:00:00 2001 From: olivroy Date: Fri, 15 Dec 2023 12:21:46 -0500 Subject: [PATCH] Avoid conflict with timetk::FANG which still uses FB --- R/excel-if-functions.R | 2 +- R/excel-stat-mutation-functions.R | 2 +- R/excel-stat-summary-functions.R | 2 +- R/tq_mutate.R | 2 +- man/excel_if_functions.Rd | 2 +- man/excel_stat_mutation_functions.Rd | 2 +- man/excel_stat_summary_functions.Rd | 2 +- man/geom_bbands.Rd | 2 +- man/geom_ma.Rd | 2 +- man/tq_mutate.Rd | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/R/excel-if-functions.R b/R/excel-if-functions.R index 71cb60ab..eb145816 100644 --- a/R/excel-if-functions.R +++ b/R/excel-if-functions.R @@ -50,7 +50,7 @@ #' #' @examplesIf rlang::is_installed("forcats") #' library(dplyr) -#' library(timetk) +#' library(timetk, exclude = "FANG") #' library(stringr) #' library(lubridate) #' diff --git a/R/excel-stat-mutation-functions.R b/R/excel-stat-mutation-functions.R index 984c68e6..421735ae 100644 --- a/R/excel-stat-mutation-functions.R +++ b/R/excel-stat-mutation-functions.R @@ -28,7 +28,7 @@ #' #' @examplesIf rlang::is_installed("forcats") #' # Libraries -#' library(timetk) +#' library(timetk, exclude = "FANG") #' library(dplyr) #' #' # --- Basic Usage ---- diff --git a/R/excel-stat-summary-functions.R b/R/excel-stat-summary-functions.R index 882f73cf..5f81ea43 100644 --- a/R/excel-stat-summary-functions.R +++ b/R/excel-stat-summary-functions.R @@ -38,7 +38,7 @@ #' #' @examplesIf rlang::is_installed("forcats") #' # Libraries -#' library(timetk) +#' library(timetk, exclude = "FANG") #' library(forcats) #' library(dplyr) #' diff --git a/R/tq_mutate.R b/R/tq_mutate.R index 0b219275..1eca1fce 100644 --- a/R/tq_mutate.R +++ b/R/tq_mutate.R @@ -70,7 +70,7 @@ #' #' ##### Basic Functionality #' -#' fb_stock_prices <- FANG %>% +#' fb_stock_prices <- tidyquant::FANG %>% #' filter(symbol == "META") %>% #' filter( #' date >= "2016-01-01", diff --git a/man/excel_if_functions.Rd b/man/excel_if_functions.Rd index a70ba609..ac7904cc 100644 --- a/man/excel_if_functions.Rd +++ b/man/excel_if_functions.Rd @@ -86,7 +86,7 @@ value (scalar). See examples below. \examples{ \dontshow{if (rlang::is_installed("forcats")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} library(dplyr) -library(timetk) +library(timetk, exclude = "FANG") library(stringr) library(lubridate) diff --git a/man/excel_stat_mutation_functions.Rd b/man/excel_stat_mutation_functions.Rd index 050eec7e..e04ea423 100644 --- a/man/excel_stat_mutation_functions.Rd +++ b/man/excel_stat_mutation_functions.Rd @@ -88,7 +88,7 @@ Most functions replicate the behavior of Excel: \examples{ \dontshow{if (rlang::is_installed("forcats")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # Libraries -library(timetk) +library(timetk, exclude = "FANG") library(dplyr) # --- Basic Usage ---- diff --git a/man/excel_stat_summary_functions.Rd b/man/excel_stat_summary_functions.Rd index a70b0df6..f1365799 100644 --- a/man/excel_stat_summary_functions.Rd +++ b/man/excel_stat_summary_functions.Rd @@ -102,7 +102,7 @@ Most functions replicate the behavior of Excel: \examples{ \dontshow{if (rlang::is_installed("forcats")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # Libraries -library(timetk) +library(timetk, exclude = "FANG") library(forcats) library(dplyr) diff --git a/man/geom_bbands.Rd b/man/geom_bbands.Rd index 0342ca3b..0eeba9cc 100644 --- a/man/geom_bbands.Rd +++ b/man/geom_bbands.Rd @@ -98,7 +98,7 @@ available including: SMA, EMA, WMA, DEMA, ZLEMA, VWMA, and EVWMA. The default is calculated; see notes.} \item{ratio}{A smoothing/decay ratio. \code{ratio} overrides \code{wilder} -in \code{EMA}, and provides additional smoothing in \code{VMA}.} +in \code{EMA}.} \item{v}{The 'volume factor' (a number in [0,1]). See Notes.} diff --git a/man/geom_ma.Rd b/man/geom_ma.Rd index 80dfd446..d6fae698 100644 --- a/man/geom_ma.Rd +++ b/man/geom_ma.Rd @@ -86,7 +86,7 @@ available including: SMA, EMA, WMA, DEMA, ZLEMA, VWMA, and EVWMA. The default is calculated; see notes.} \item{ratio}{A smoothing/decay ratio. \code{ratio} overrides \code{wilder} -in \code{EMA}, and provides additional smoothing in \code{VMA}.} +in \code{EMA}.} \item{v}{The 'volume factor' (a number in [0,1]). See Notes.} diff --git a/man/tq_mutate.Rd b/man/tq_mutate.Rd index 78418795..e6ae1e74 100644 --- a/man/tq_mutate.Rd +++ b/man/tq_mutate.Rd @@ -122,7 +122,7 @@ library(dplyr) ##### Basic Functionality -fb_stock_prices <- FANG \%>\% +fb_stock_prices <- tidyquant::FANG \%>\% filter(symbol == "META") \%>\% filter( date >= "2016-01-01",