From e2e7c1ccbc0982d9e87a92b084c6900049c2e7e7 Mon Sep 17 00:00:00 2001 From: wilsonfreitas Date: Tue, 11 Apr 2017 05:13:18 -0300 Subject: [PATCH] Renamed has.calendar to has.calendars --- NAMESPACE | 2 +- R/calendar.R | 4 ++-- man/calendar-register.Rd | 5 +++-- tests/testthat/test-register.R | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 6d7c5b1..ff1ead3 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -38,7 +38,7 @@ export(bizseq) export(calendars) export(create.calendar) export(following) -export(has.calendar) +export(has.calendars) export(is.bizday) export(load_quantlib_calendars) export(load_rmetrics_calendars) diff --git a/R/calendar.R b/R/calendar.R index da9d4d4..181da5e 100644 --- a/R/calendar.R +++ b/R/calendar.R @@ -278,7 +278,7 @@ check_calendar <- function(cal) { #' @export #' @rdname calendar-register #' @examples -#' has.calendar(c("actual", "weekends")) -has.calendar <- function(cals) { +#' has.calendars(c("actual", "weekends")) +has.calendars <- function(cals) { cals %in% ls(.CALENDAR_REGISTER) } \ No newline at end of file diff --git a/man/calendar-register.Rd b/man/calendar-register.Rd index 4fc42e9..c14dcec 100644 --- a/man/calendar-register.Rd +++ b/man/calendar-register.Rd @@ -4,14 +4,14 @@ \alias{calendar-register} \alias{calendars} \alias{remove.calendars} -\alias{has.calendar} +\alias{has.calendars} \title{Calendars register} \usage{ calendars() remove.calendars(cals) -has.calendar(cals) +has.calendars(cals) } \arguments{ \item{cals}{character vector of calendars names} @@ -36,4 +36,5 @@ cal <- calendars()[["Actual"]] remove.calendars("Actual") # lists registered calendars calendars() +has.calendars(c("actual", "weekends")) } diff --git a/tests/testthat/test-register.R b/tests/testthat/test-register.R index 8e90e3f..a6fd248 100644 --- a/tests/testthat/test-register.R +++ b/tests/testthat/test-register.R @@ -46,7 +46,7 @@ test_that('it should remove a calendar', { test_that("it should check if a calendar exists", { create.calendar("actual") - expect_true(has.calendar("actual")) - expect_false(has.calendar("nama")) - expect_equal(has.calendar(c("actual", "weekends", "nama")), c(TRUE, TRUE, FALSE)) + expect_true(has.calendars("actual")) + expect_false(has.calendars("nama")) + expect_equal(has.calendars(c("actual", "weekends", "nama")), c(TRUE, TRUE, FALSE)) }) \ No newline at end of file