Skip to content

Commit

Permalink
Merge eaa722c into fa8894e
Browse files Browse the repository at this point in the history
  • Loading branch information
GregorDeCillia committed Jan 29, 2020
2 parents fa8894e + eaa722c commit 59c973d
Show file tree
Hide file tree
Showing 18 changed files with 389 additions and 367 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ inst/doc
docs
doc
Meta
Dev
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cache: packages
branches:
only:
- master
- TradingDays

notifications:
email:
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Remotes:
jdemetra/rjdemetra
Roxygen: list(markdown = TRUE)
URL: https://github.com/statistikat/persephone
RoxygenNote: 6.1.1
RoxygenNote: 7.0.2
Suggests:
knitr,
rmarkdown,
Expand Down
119 changes: 2 additions & 117 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ S3method(plot,hierarchicalTimeSeries)
S3method(plot,persephoneSingle)
export(as.persephone)
export(autoplot)
export(genTd)
export(gen_td)
export(generate_qr_table)
export(hierarchicalTimeSeries)
export(is.persephone)
export(iterate)
export(per_hts)
Expand Down Expand Up @@ -45,121 +44,7 @@ importFrom(stats,start)
importFrom(stats,time)
importFrom(stats,ts)
importFrom(stats,window)
importFrom(timeDate,Advent1st)
importFrom(timeDate,Advent2nd)
importFrom(timeDate,Advent3rd)
importFrom(timeDate,Advent4th)
importFrom(timeDate,AllSaints)
importFrom(timeDate,AllSouls)
importFrom(timeDate,Annunciation)
importFrom(timeDate,Ascension)
importFrom(timeDate,AshWednesday)
importFrom(timeDate,AssumptionOfMary)
importFrom(timeDate,BirthOfVirginMary)
importFrom(timeDate,BoxingDay)
importFrom(timeDate,CACanadaDay)
importFrom(timeDate,CACivicProvincialHoliday)
importFrom(timeDate,CALabourDay)
importFrom(timeDate,CAThanksgivingDay)
importFrom(timeDate,CAVictoriaDay)
importFrom(timeDate,CHAscension)
importFrom(timeDate,CHBerchtoldsDay)
importFrom(timeDate,CHConfederationDay)
importFrom(timeDate,CHKnabenschiessen)
importFrom(timeDate,CHSechselaeuten)
importFrom(timeDate,CaRemembranceDay)
importFrom(timeDate,CelebrationOfHolyCross)
importFrom(timeDate,ChristTheKing)
importFrom(timeDate,ChristmasDay)
importFrom(timeDate,ChristmasEve)
importFrom(timeDate,CorpusChristi)
importFrom(timeDate,DEAscension)
importFrom(timeDate,DEChristmasEve)
importFrom(timeDate,DECorpusChristi)
importFrom(timeDate,DEGermanUnity)
importFrom(timeDate,DENewYearsEve)
importFrom(timeDate,Easter)
importFrom(timeDate,EasterMonday)
importFrom(timeDate,EasterSunday)
importFrom(timeDate,Epiphany)
importFrom(timeDate,FRAllSaints)
importFrom(timeDate,FRArmisticeDay)
importFrom(timeDate,FRAscension)
importFrom(timeDate,FRAssumptionVirginMary)
importFrom(timeDate,FRBastilleDay)
importFrom(timeDate,FRFetDeLaVictoire1945)
importFrom(timeDate,GBBankHoliday)
importFrom(timeDate,GBMayDay)
importFrom(timeDate,GBMilleniumDay)
importFrom(timeDate,GBSummerBankHoliday)
importFrom(timeDate,GoodFriday)
importFrom(timeDate,ITAllSaints)
importFrom(timeDate,ITAssumptionOfVirginMary)
importFrom(timeDate,ITEpiphany)
importFrom(timeDate,ITImmaculateConception)
importFrom(timeDate,ITLiberationDay)
importFrom(timeDate,ITStAmrose)
importFrom(timeDate,JPAutumnalEquinox)
importFrom(timeDate,JPBankHolidayDec31)
importFrom(timeDate,JPBankHolidayJan2)
importFrom(timeDate,JPBankHolidayJan3)
importFrom(timeDate,JPBunkaNoHi)
importFrom(timeDate,JPChildrensDay)
importFrom(timeDate,JPComingOfAgeDay)
importFrom(timeDate,JPConstitutionDay)
importFrom(timeDate,JPEmperorsBirthday)
importFrom(timeDate,JPGantan)
importFrom(timeDate,JPGreeneryDay)
importFrom(timeDate,JPHealthandSportsDay)
importFrom(timeDate,JPKeirouNOhi)
importFrom(timeDate,JPKenkokuKinenNoHi)
importFrom(timeDate,JPKenpouKinenBi)
importFrom(timeDate,JPKinrouKanshaNoHi)
importFrom(timeDate,JPKodomoNoHi)
importFrom(timeDate,JPKokuminNoKyujitu)
importFrom(timeDate,JPMarineDay)
importFrom(timeDate,JPMidoriNoHi)
importFrom(timeDate,JPNatFoundationDay)
importFrom(timeDate,JPNationHoliday)
importFrom(timeDate,JPNationalCultureDay)
importFrom(timeDate,JPNewYearsDay)
importFrom(timeDate,JPRespectForTheAgedDay)
importFrom(timeDate,JPSeijinNoHi)
importFrom(timeDate,JPShuubunNoHi)
importFrom(timeDate,JPTaiikuNoHi)
importFrom(timeDate,JPTennouTanjyouBi)
importFrom(timeDate,JPThanksgivingDay)
importFrom(timeDate,JPUmiNoHi)
importFrom(timeDate,LaborDay)
importFrom(timeDate,MassOfArchangels)
importFrom(timeDate,NewYearsDay)
importFrom(timeDate,PalmSunday)
importFrom(timeDate,Pentecost)
importFrom(timeDate,PentecostMonday)
importFrom(timeDate,PresentationOfLord)
importFrom(timeDate,Quinquagesima)
importFrom(timeDate,RogationSunday)
importFrom(timeDate,Septuagesima)
importFrom(timeDate,SolemnityOfMary)
importFrom(timeDate,TransfigurationOfLord)
importFrom(timeDate,TrinitySunday)
importFrom(timeDate,USCPulaskisBirthday)
importFrom(timeDate,USChristmasDay)
importFrom(timeDate,USColumbusDay)
importFrom(timeDate,USDecorationMemorialDay)
importFrom(timeDate,USElectionDay)
importFrom(timeDate,USGoodFriday)
importFrom(timeDate,USInaugurationDay)
importFrom(timeDate,USIndependenceDay)
importFrom(timeDate,USLaborDay)
importFrom(timeDate,USLincolnsBirthday)
importFrom(timeDate,USMLKingsBirthday)
importFrom(timeDate,USMemorialDay)
importFrom(timeDate,USNewYearsDay)
importFrom(timeDate,USPresidentsDay)
importFrom(timeDate,USThanksgivingDay)
importFrom(timeDate,USVeteransDay)
importFrom(timeDate,USWashingtonsBirthday)
importFrom(timeDate,listHolidays)
importFrom(utils,data)
importFrom(zoo,as.Date)
importFrom(zoo,as.yearmon)
31 changes: 31 additions & 0 deletions R/eaDist_approx.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#' Distribution of the dates for Easter (Approximation)
#'
#' The date of Easter (Sunday) varies between March 22nd and April 25th.
#' The sequence of Easter is periodic with a period of 5.7 mio years.
#' The distribution of this sequence can be appoximated by the following
#' table (see Eurostat)
#'
#' 22/3: 1/7 * 1/29.53059
#' 23/3: 1/7 * 2/29.53059
#' 24/3: 1/7 * 3/29.53059
#' 25/3: 1/7 * 4/29.53059
#' 26/3: 1/7 * 5/29.53059
#' 27/3: 1/7 * 6/29.53059
#' 28/3: 1/29.53059
#' 29/3: 1/29.53059
#' ... ...
#' 18/4: 1/29.53059
#' 19/4: 1/7 * (6 + 1.53059)/29.53059
#' 20/4: 1/7 * (5 + 1.53059)/29.53059
#' 21/4: 1/7 * (4 + 1.53059)/29.53059
#' 22/4: 1/7 * (3 + 1.53059)/29.53059
#' 23/4: 1/7 * (2 + 1.53059)/29.53059
#' 24/4: 1/7 * (1 + 1.53059)/29.53059
#'
#' @docType data
#' @keywords datasets
#' @name eaDist_approx
#' @usage data(eaDist_approx)
#' @references Extracted on 15.02.20 from \url{https://ec.europa.eu/eurostat/cros/system/files/jd__calendars_0.docx}
#' @format Distribution of Easter Dates
NULL
12 changes: 12 additions & 0 deletions R/eaDist_exact.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#' Distribution of the dates for Easter (Exact)
#'
#' The date of Easter (Sunday) varies between March 22nd and April 25th.
#' The sequence of Easter is periodic with a period of 5.7 mio years.
#'
#' @docType data
#' @keywords datasets
#' @name eaDist_exact
#' @usage data(eaDist_exact)
#' @references Extracted on 15.02.20 from \url{https://ec.europa.eu/eurostat/cros/system/files/jd__calendars_0.docx}
#' @format Theoretical Distribution of Easter Dates over the span of 5.7 mio years
NULL
120 changes: 0 additions & 120 deletions R/genTd.R

This file was deleted.

Loading

0 comments on commit 59c973d

Please sign in to comment.