From 7a52ea777f1427e0be6b2fcee0256cff6e1ea3eb Mon Sep 17 00:00:00 2001 From: Graham White Date: Mon, 30 Oct 2023 23:20:00 +1100 Subject: [PATCH 1/3] documentation --- .Rbuildignore | 1 + CRAN-SUBMISSION | 3 +++ DESCRIPTION | 2 +- man/dominicksData.Rd | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 CRAN-SUBMISSION diff --git a/.Rbuildignore b/.Rbuildignore index cd39588..efdb2a7 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -11,3 +11,4 @@ ^README\.Rmd$ ^LICENSE.md ^\.github$ +^CRAN-SUBMISSION$ diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION new file mode 100644 index 0000000..0b2c49b --- /dev/null +++ b/CRAN-SUBMISSION @@ -0,0 +1,3 @@ +Version: 0.6.0 +Date: 2023-10-26 12:44:17 UTC +SHA: 89b268a390ffefda22d05479657aa771c68c38e6 diff --git a/DESCRIPTION b/DESCRIPTION index 6f1e056..30bdc03 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -15,7 +15,7 @@ Description: Computes bilateral and multilateral index numbers. License: GPL-2 Encoding: UTF-8 LazyData: true -RoxygenNote: 7.2.0 +RoxygenNote: 7.2.3 URL: https://github.com/grahamjwhite/IndexNumR Depends: R (>= 3.5.0) Imports: utils diff --git a/man/dominicksData.Rd b/man/dominicksData.Rd index 4f243d9..777df49 100644 --- a/man/dominicksData.Rd +++ b/man/dominicksData.Rd @@ -22,9 +22,9 @@ data from over 100 stores, collected from 1989-1994. The data consist of a UPC file that contains information on the products, and a movement file that contains the information on prices and sales. For a complete description of the data, see -\href{https://www.chicagobooth.edu/research/kilts/datasets/dominicks}{Dominicks data website} +\href{https://www.chicagobooth.edu/research/kilts/research-data/dominicks}{Dominicks data website} and the -\href{https://www.chicagobooth.edu/-/media/enterprise/centers/kilts/datasets/dominicks-dataset/dominicks-manual-and-codebook_kiltscenter.aspx}{Dominicks data user manual}. +\href{https://www.chicagobooth.edu/-/media/enterprise/centers/kilts/datasets/dominicks-dataset/dominicks-manual-and-codebook_kiltscenter}{Dominicks data user manual}. This function downloads and merges the movement and UPC files, then merges the result with data detailing the dates of each of the weeks in the movement file. } From 3a2357eddcde637547f8f5d77ad018125d88b16f Mon Sep 17 00:00:00 2001 From: Graham White Date: Thu, 2 Nov 2023 22:00:34 +1100 Subject: [PATCH 2/3] Git ignore cran submission file --- .gitignore | 1 + CRAN-SUBMISSION | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 CRAN-SUBMISSION diff --git a/.gitignore b/.gitignore index e87b709..ebbec34 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Meta CRAN-RELEASE /doc/ /Meta/ +CRAN_SUBMISSION diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION deleted file mode 100644 index 0b2c49b..0000000 --- a/CRAN-SUBMISSION +++ /dev/null @@ -1,3 +0,0 @@ -Version: 0.6.0 -Date: 2023-10-26 12:44:17 UTC -SHA: 89b268a390ffefda22d05479657aa771c68c38e6 From fc6341b498f3838a0f5d31798670eab05ee1f333 Mon Sep 17 00:00:00 2001 From: Graham White Date: Fri, 10 Nov 2023 21:44:09 +1100 Subject: [PATCH 3/3] fix broken urls --- R/data.R | 2 +- man/DominicksWeeks.Rd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/R/data.R b/R/data.R index b937019..ebb5d29 100644 --- a/R/data.R +++ b/R/data.R @@ -37,7 +37,7 @@ #' Date information for the Dominicks data #' -#' Table from the \href{https://www.chicagobooth.edu/-/media/enterprise/centers/kilts/datasets/dominicks-dataset/dominicks-manual-and-codebook_kiltscenter.aspx}{Dominicks Data Manual}, +#' Table from the \href{https://www.chicagobooth.edu/-/media/enterprise/centers/kilts/datasets/dominicks-dataset/dominicks-manual-and-codebook_kiltscenter}{Dominicks Data Manual}, #' that gives the start and end date of each of the weeks in the movement #' files. #' diff --git a/man/DominicksWeeks.Rd b/man/DominicksWeeks.Rd index 8c0fcae..ac04306 100644 --- a/man/DominicksWeeks.Rd +++ b/man/DominicksWeeks.Rd @@ -20,7 +20,7 @@ Dominicks Data Manual, Chicago Booth Kilts Center for Marketing, 2018, pages 21- DominicksWeeks } \description{ -Table from the \href{https://www.chicagobooth.edu/-/media/enterprise/centers/kilts/datasets/dominicks-dataset/dominicks-manual-and-codebook_kiltscenter.aspx}{Dominicks Data Manual}, +Table from the \href{https://www.chicagobooth.edu/-/media/enterprise/centers/kilts/datasets/dominicks-dataset/dominicks-manual-and-codebook_kiltscenter}{Dominicks Data Manual}, that gives the start and end date of each of the weeks in the movement files. }