Skip to content

Commit f642d8e

Browse files
Merge branch 'main' into huge_hier
2 parents dc0db7e + 9e992c4 commit f642d8e

18 files changed

+419
-43
lines changed

.Rbuildignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
^README\.Rmd$
55
^TODO\.Rmd$
66
^TODO\.md$
7+
^index\.md$
78
^examples$
89
^\.github$
910
^codecov\.yml$
@@ -12,3 +13,7 @@
1213
^data-raw$
1314
^\./tests/testthat/dataForTests/generate_weeklyTestData\.R$
1415
^bayesRecon\.Rproj$
16+
^tests/testthat/dataForTests/generate_monthlyCountData\.R$
17+
^_pkgdown\.yml$
18+
^docs$
19+
^pkgdown$

.github/workflows/pkgdown.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
push:
5+
branches: [main, master]
6+
pull_request:
7+
release:
8+
types: [published]
9+
workflow_dispatch:
10+
11+
name: pkgdown.yaml
12+
13+
permissions: read-all
14+
15+
jobs:
16+
pkgdown:
17+
runs-on: ubuntu-latest
18+
# Only restrict concurrency for non-PR jobs
19+
concurrency:
20+
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
21+
env:
22+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
23+
permissions:
24+
contents: write
25+
steps:
26+
- uses: actions/checkout@v4
27+
28+
- uses: r-lib/actions/setup-pandoc@v2
29+
30+
- uses: r-lib/actions/setup-r@v2
31+
with:
32+
use-public-rspm: true
33+
34+
- uses: r-lib/actions/setup-r-dependencies@v2
35+
with:
36+
extra-packages: any::pkgdown, local::.
37+
needs: website
38+
39+
- name: Build site
40+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
41+
shell: Rscript {0}
42+
43+
- name: Deploy to GitHub pages 🚀
44+
if: github.event_name != 'pull_request'
45+
uses: JamesIves/github-pages-deploy-action@v4.5.0
46+
with:
47+
clean: false
48+
branch: gh-pages
49+
folder: docs

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
inst/doc
88
/doc/
99
/Meta/
10+
docs

DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: bayesRecon
22
Type: Package
3-
Date: 2024-08-28
3+
Date: 2024-11-04
44
Title: Probabilistic Reconciliation via Conditioning
5-
Version: 0.3.1
5+
Version: 0.3.2
66
Authors@R: c(person(given = "Dario",
77
family = "Azzimonti",
88
role = c("aut","cre"),
@@ -52,5 +52,5 @@ Suggests:
5252
testthat (>= 3.0.0)
5353
Config/testthat/edition: 3
5454
VignetteBuilder: knitr
55-
URL: https://github.com/IDSIA/bayesRecon
55+
URL: https://github.com/IDSIA/bayesRecon, https://idsia.github.io/bayesRecon/
5656
BugReports: https://github.com/IDSIA/bayesRecon/issues

NEWS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# bayesRecon 0.3.2
2+
3+
* Fixed issues in tests that would run into compatibility issues with the new version of waldo.
4+
5+
* Added new tests for some limit usage of mixCond, TDcond and BUIS.
6+
7+
* Added GitHub URL and BugReports URL to DESCRIPTION.
8+
19
# bayesRecon 0.3.1
210

311
* IMPORTANT CHANGE IN THE API OF THE `reconc_*` functions: they now require the aggregation matrix A and not the summing matrix S.

README.Rmd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ knitr::opts_chunk$set(
2424
[![](http://cranlogs.r-pkg.org/badges/grand-total/bayesRecon)](https://cran.r-project.org/package=bayesRecon)
2525
[![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
2626
[![License: LGPL (>= 3)](https://img.shields.io/badge/license-LGPL (>= 3)-yellow.svg)](https://www.gnu.org/licences/lgpl-3.0)
27-
[![coverage](https://coveralls.io/repos/github/IDSIA/bayesRecon/badge.svg)](https://coveralls.io/r/IDSIA/bayesRecon?branch=main)
27+
[![coverage](https://coveralls.io/repos/github/IDSIA/bayesRecon/badge.svg)](https://coveralls.io/github/IDSIA/bayesRecon)
2828
<!-- badges: end -->
2929

3030
The package `bayesRecon` implements several methods for probabilistic reconciliation of hierarchical time series forecasts.
@@ -260,12 +260,13 @@ Statistics and Computing 34 (1), 21.
260260

261261
Zambon, L., Agosto, A., Giudici, P., Corani, G. (2024).
262262
*Properties of the reconciled distributions for Gaussian and count forecasts*.
263-
International Journal of Forecasting (in press).
263+
International Journal of Forecasting 40 (4), 1438-1448.
264264
[DOI](https://doi.org/10.1016/j.ijforecast.2023.12.004)
265265

266-
Zambon, L., Azzimonti, D., Rubattu, N., Corani, G. (2024).
267-
*Probabilistic reconciliation of mixed-type hierarchical time series*.
268-
The 40th Conference on Uncertainty in Artificial Intelligence, accepted.
266+
Zambon, L., Azzimonti, D., Rubattu, N., Corani, G. (2024).
267+
*Probabilistic reconciliation of mixed-type hierarchical time series*.
268+
Proceedings of the Fortieth Conference on Uncertainty in Artificial Intelligence,
269+
in Proceedings of Machine Learning Research 244:4078-4095. [Available here](https://proceedings.mlr.press/v244/zambon24a.html).
269270

270271
## Contributors
271272

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ status](https://www.r-pkg.org/badges/version/bayesRecon)](https://CRAN.R-project
1616
experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
1717
[![License: LGPL (\>=
1818
3)](https://img.shields.io/badge/license-LGPL%20(%3E=%203)-yellow.svg)](https://www.gnu.org/licences/lgpl-3.0)
19-
[![coverage](https://coveralls.io/repos/github/IDSIA/bayesRecon/badge.svg)](https://coveralls.io/r/IDSIA/bayesRecon?branch=main)
19+
[![coverage](https://coveralls.io/repos/github/IDSIA/bayesRecon/badge.svg)](https://coveralls.io/github/IDSIA/bayesRecon)
2020
<!-- badges: end -->
2121

2222
The package `bayesRecon` implements several methods for probabilistic
@@ -275,12 +275,14 @@ Statistics and Computing 34 (1), 21.
275275

276276
Zambon, L., Agosto, A., Giudici, P., Corani, G. (2024). *Properties of
277277
the reconciled distributions for Gaussian and count forecasts*.
278-
International Journal of Forecasting (in press).
278+
International Journal of Forecasting 40 (4), 1438-1448.
279279
[DOI](https://doi.org/10.1016/j.ijforecast.2023.12.004)
280280

281281
Zambon, L., Azzimonti, D., Rubattu, N., Corani, G. (2024).
282282
*Probabilistic reconciliation of mixed-type hierarchical time series*.
283-
The 40th Conference on Uncertainty in Artificial Intelligence, accepted.
283+
Proceedings of the Fortieth Conference on Uncertainty in Artificial
284+
Intelligence, in Proceedings of Machine Learning Research 244:4078-4095.
285+
[Available here](https://proceedings.mlr.press/v244/zambon24a.html).
284286

285287
## Contributors
286288

_pkgdown.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
url: https://idsia.github.io/bayesRecon/
2+
template:
3+
bootstrap: 5
4+

0 commit comments

Comments
 (0)