Skip to content

Commit cec9f42

Browse files
committed
update urls
1 parent e83e7ee commit cec9f42

11 files changed

+30
-32
lines changed

NEWS.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* Very small documentation changes.
3434
* Changing the code to dplyr 1.0+ and rlang in non-standard evaluation.
3535
* New website, CI on Github. Renewed [![codecov](https://codecov.io/gh/rOpenGov/iotables/branch/master/graph/badge.svg)](https://app.codecov.io/gh/rOpenGov/iotables), documentation changed to gfm flavored markdown.
36-
* Thanks to [\@KKulma](https://github.com/KKulma/) for setting up new and improved continuous integration, and [\@pitkant](https://github.com/pitkant) for implementing many good practices on improving the code. See [contributors](https://github.com/ropengov/iotables/graphs/contributors). This project is part of [rOpenGov](http://ropengov.org).
36+
* Thanks to [\@KKulma](https://github.com/KKulma/) for setting up new and improved continuous integration, and [\@pitkant](https://github.com/pitkant) for implementing many good practices on improving the code. See [contributors](https://github.com/ropengov/iotables/graphs/contributors). This project is part of [rOpenGov](https://ropengov.org).
3737
* 0.4.4 is released on CRAN.
3838

3939
# iotables 0.4.3
@@ -74,7 +74,7 @@ is seldom used, as the analytical function will call it as needed.
7474
* New convenience function for nicer printing of structured SIOT tables and related matrix results. Not yet exported, first will be used on vignettes only.
7575

7676
# iotables 0.3.7
77-
* New example `data(netherlands_2006)`, terminology and analytical improvements following [Input-Output Multipliers Specification Sheet and Supporting Material, Spicosa Project Report](http://www.coastal-saf.eu/output-step/pdf/Specification sheet I_O_final.pdf). Results are checked against the publication.
77+
* New example `data(netherlands_2006)`, terminology and analytical improvements following [Input-Output Multipliers Specification Sheet and Supporting Material, Spicosa Project Report](https://www.coastal-saf.eu/output-step/pdf/Specification sheet I_O_final.pdf). Results are checked against the publication.
7878
* For terminological clarity, earlier `direct_supply_effects_create()` function is renamed `direct_supply_effects_create()`.
7979
* The function `effects_create()` currently refers to the function returning direct effects of a change in demand.
8080
* The function `multipliers_create()` refers to the function returning direct and indirect effects of a change in demand.
@@ -154,7 +154,7 @@ The forthcoming update will rewrite and generalize some of the earlier functions
154154

155155
At this point I will go with preparing a release the table on CRAN. The current version builds without warnings or notes on Windows and Linux.
156156

157-
iotables 0.2 is moved to [rOpenGov](http://ropengov.org/).
157+
iotables 0.2 is moved to [rOpenGov](https://ropengov.org/).
158158

159159

160160
# iotables 0.1.4
@@ -173,4 +173,4 @@ New functions are added which enable a very simple IO analysis. As an important
173173
* Added a `NEWS.md` file to track changes to the package.
174174
* Added Contributor Code of Conduct in `CONDUCT.md`
175175
* Some functions have parallel versions, and will be brought to [rOpenSci](https://github.com/ropensci/software-review) naming conventions (`object_verb()`)
176-
* Asked to join [rOpenGov](http://ropengov.github.io/) - excited but inexperienced in this!
176+
* Asked to join [rOpenGov](https://ropengov.github.io/) - excited but inexperienced in this!

R/data-croatia_2010_1700.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#'
33
#' 1700 - Symmetric input-output table at basic prices (product x product)
44
#' In thousand kunas (T_NAC)
5-
#' @source \href{https://www.dzs.hr/}{Državni zavod za statistiku}.
5+
#' @source \href{https://dzs.gov.hr/}{Državni zavod za statistiku}.
66
#' @usage data(croatia_2010_1700)
77
#' @format A data frame with 13 variables.
88
#'\describe{

R/data-croatia_2010_1800.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#' 1800 - Symmetric input-output table for domestic production
44
#' (product x product)
55
#' In thousand kunas (T_NAC)
6-
#' @source \href{https://www.dzs.hr/}{Državni zavod za statistiku}.
6+
#' @source \href{https://dzs.gov.hr/}{Državni zavod za statistiku}.
77
#' @usage data(croatia_2010_1800)
88
#' @format A data frame with 13 variables.
99
#'\describe{

R/data-croatia_2010_1900.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#'
33
#' 1900 - Symmetric input-output table for imports (product x product)
44
#' In thousand kunas (T_NAC)
5-
#' @source \href{https://www.dzs.hr/}{Državni zavod za statistiku}.
5+
#' @source \href{https://dzs.gov.hr/}{Državni zavod za statistiku}.
66
#' @usage data(croatia_2010_1900)
77
#' @format A data frame with 13 variables.
88
#'\describe{

README.Rmd

+2-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The aim of this introduction is not to introduce input-output economics, or SIOT
4545

4646
In order to test the analytical functions of the package and to have a manageable sized example data set, we use the real-life data from the Eurostat manual. The `germany_1995` dataset is a simplified 6x6 sized SIOT taken from the `Eurostat Manual` (`p481`). The package function examples can be checked against [published results from Jörg Beutel](https://ec.europa.eu/eurostat/documents/3859598/5902113/KS-RA-07-013-EN.PDF/b0b3d71e-3930-4442-94be-70b36cea9b39?version=1.0). These calculations can be followed in the [Introduction to iotables](https://iotables.dataobservatory.eu/articles/intro.html) vignette.
4747

48-
The calculation of induced effects (Type-II multipliers) are following the [Input-Output Multipliers Specification Sheet and Supporting Material, Spicosa Project Report](http://www.coastal-saf.eu/output-step/pdf/Specification sheet I_O_final.pdf). The analytical functions are tested against this example, too.
48+
The calculation of induced effects (Type-II multipliers) are following the [Input-Output Multipliers Specification Sheet and Supporting Material, Spicosa Project Report](https://www.coastal-saf.eu/output-step/pdf/Specification sheet I_O_final.pdf). The analytical functions are tested against this example, too.
4949

5050
## Installation
5151

@@ -62,8 +62,6 @@ devtools::install_github("rOpenGov/iotables")
6262
#devtools::install_github("rOpenGov/iotables", build_vignettes = TRUE)
6363
```
6464

65-
You can download the manual in PDF for the [0.9 development release](https://iotables.dataobservatory.eu/iotables_0.9.pdf). and follow the changes on the [Changelog/NEWS](https://iotables.dataobservatory.eu/news/index.html).
66-
6765
See also a long-form documentation (publication candidate) [iotables: an R Package for Reproducible Input-Output Economics Analysis, Economic and Environmental Impact Assessment with Empirical Data](https://zenodo.org/record/5887038#.Ye2ovv7MLIU) on Zenodo.
6866

6967
## Vignettes
@@ -108,7 +106,7 @@ Contributions are very welcome:
108106
Daniel Antal. (2022. September 24.) rOpenGov/iotables: Importing and Manipulating Symmetric Input-Output Tables (Version 0.9.1). Zenodo. [https://doi.org/10.5281/zenodo.7109769](https://zenodo.org/record/5153006/) for released version.
109107
Development version URL: [https://ropengov.github.io/iotables/](https://ropengov.github.io/iotables/)
110108

111-
Thanks to [\@KKulma](https://github.com/KKulma/) for setting up new and improved continuous integration, and [\@pitkant](https://github.com/pitkant) for implementing many good practices on improving the code. See [contributors](https://github.com/ropengov/iotables/graphs/contributors). This project is part of [rOpenGov](http://ropengov.org).
109+
Thanks to [\@KKulma](https://github.com/KKulma/) for setting up new and improved continuous integration, and [\@pitkant](https://github.com/pitkant) for implementing many good practices on improving the code. See [contributors](https://github.com/ropengov/iotables/graphs/contributors). This project is part of [rOpenGov](https://ropengov.org).
112110

113111

114112
## Code of Conduct

README.md

+4-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- <img src="/man/figures/logo.png" align="right" height="205 width="205"/>-->
66

77
![iotables](man/figures/logo20.png)
8-
[![rOG-badge](https://ropengov.github.io/rogtemplate/reference/figures/ropengov-badge.svg)](http://ropengov.org/)
8+
[![rOG-badge](https://ropengov.github.io/rogtemplate/reference/figures/ropengov-badge.svg)](https://ropengov.org/)
99
[![packageversion](https://img.shields.io/badge/Package%20version-0.9.1-orange.svg?style=flat-square)](https://github.com/rOpenGov/iotables/commits/master)
1010
[![R-CMD-check](https://github.com/rOpenGov/iotables/workflows/R-CMD-check/badge.svg)](https://github.com/rOpenGov/iotables/actions)
1111
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/iotables)](https://cran.r-project.org/package=iotables)
@@ -29,7 +29,7 @@ structure. They are often found in spreadsheets that follow this
2929
structure, or in the case Eurostat in a data repository. In both cases
3030
they in reproducible research must be downloaded and restructured to
3131
programmatically accessible form. Often these highly structured
32-
statistics need to be analyzed together with other data, for example,
32+
statistics need to be analysed together with other data, for example,
3333
when employment effects and multipliers are calculated. In this case
3434
processing the employment data to SIOT conforming format is a
3535
significant preprocessing challenge.
@@ -59,7 +59,7 @@ vignette.
5959
The calculation of induced effects (Type-II multipliers) are following
6060
the [Input-Output Multipliers Specification Sheet and Supporting
6161
Material, Spicosa Project
62-
Report](http://www.coastal-saf.eu/output-step/pdf/Specification%20sheet%20I_O_final.pdf).
62+
Report](https://www.coastal-saf.eu/output-step/pdf/Specification%20sheet%20I_O_final.pdf).
6363
The analytical functions are tested against this example, too.
6464

6565
## Installation
@@ -78,11 +78,6 @@ devtools::install_github("rOpenGov/iotables")
7878
#devtools::install_github("rOpenGov/iotables", build_vignettes = TRUE)
7979
```
8080

81-
You can download the manual in PDF for the [0.9 development
82-
release](https://iotables.dataobservatory.eu/iotables_0.9.pdf). and
83-
follow the changes on the
84-
[Changelog/NEWS](https://iotables.dataobservatory.eu/news/index.html).
85-
8681
See also a long-form documentation (publication candidate) [iotables: an
8782
R Package for Reproducible Input-Output Economics Analysis, Economic and
8883
Environmental Impact Assessment with Empirical
@@ -164,7 +159,7 @@ improved continuous integration, and
164159
[@pitkant](https://github.com/pitkant) for implementing many good
165160
practices on improving the code. See
166161
[contributors](https://github.com/ropengov/iotables/graphs/contributors).
167-
This project is part of [rOpenGov](http://ropengov.org).
162+
This project is part of [rOpenGov](https://ropengov.org).
168163

169164
## Code of Conduct
170165

cran-comments.md

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
## Test environments
22
* x86_64-w64-mingw32 (64-bit), R version 4.2.1 (2022-06-23 ucrt)
3-
* R-devel with win-builder.r-project.org, x86_64-w64-mingw32, R Under development (unstable) (2022-09-23 r82903 ucrt)
4-
* -oldrelease with win-builder.r-project.org
5-
* mac.r-project.org
3+
* R version 4.1.3 (2022-03-10) with oldrelease on win-builder.r-project.org
4+
* R-devel with win-builder.r-project.org, x86_64-w64-mingw32, R Under development (unstable) (2022-09-23 r82903 ucrt)
5+
* r-release-macosx-arm64|4.2.1|macosx|macOS 11.5.2 (20G95)|Mac mini|Apple M1||en_US.UTF-8
6+
* Fedora Linux, R-devel, clang, gfortran on <https://builder.r-hub.io/>
7+
* Ubuntu Linux 20.04.1 LTS, R-release, GCC on <https://builder.r-hub.io/>
8+
* Windows Server 2022, R-devel, 64 bit on <https://builder.r-hub.io/>
69
* Appveyor R version 4.2.1 Patched (2022-09-23 r82903 ucrt)
7-
10+
* Github actions <https://github.com/rOpenGov/iotables/actions>
811

912
## testthat results
1013
[ FAIL 0 | WARN 0 | SKIP 0 | PASS 87 ]
@@ -14,8 +17,10 @@
1417

1518
## Notes
1619
1. I received an email from CRAN about "Found the following HTML validation
17-
problems" NOTEs in the "HTML version of manual" check for at least some
18-
of the r-devel checks results. ... R 4.2.0 switched to use HTML5 for documentation pages. Now validation using HTML Tidy finds problems in the HTML generated from your Rd
19-
files.
20+
problems" NOTEs in the 'HTML version of manual' check for at least some
21+
of the r-devel checks results. ... 'R 4.2.0 switched to use HTML5 for documentation pages. Now validation using HTML Tidy finds problems in the HTML generated from your Rd
22+
files.'" -> fixed documentation issues, and at the same time reviewed outdated URLs.
23+
24+
2. A small reported bug was fixed in indirect_effects_create() and an extra unit test was added.
2025

21-
2. A small reported bug was fixed in indirect_effects_create() and an extra unit test was added.
26+
3. Minor changes to conform CRAN recommendations were implemented in the code.

man/croatia_2010_1700.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/croatia_2010_1800.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/croatia_2010_1900.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

not_included/croatia_scrap.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ croatia_temp_file <- paste0(tempdir(),
1717
"\\croatia.xlsx" )
1818

1919
?download.file
20-
download.file(url = "https://www.dzs.hr/Hrv_Eng/publication/2015/12-01-04_01_2015.xlsx",
20+
download.file(url = "https://dzs.gov.hr/Hrv_Eng/publication/2015/12-01-04_01_2015.xlsx",
2121
destfile = croatia_temp_file,
2222
mode = 'wb' )
2323

0 commit comments

Comments
 (0)