Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipeaGIT/r5r
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0
Choose a base ref
...
head repository: ipeaGIT/r5r
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Apr 25, 2024

  1. Closes #382

    rafapereirabr committed Apr 25, 2024
    Copy the full SHA
    808db5b View commit details

Commits on Apr 26, 2024

  1. Copy the full SHA
    eeabebb View commit details

Commits on Jun 11, 2024

  1. Copy the full SHA
    47b76f6 View commit details
  2. Copy the full SHA
    b4e72ea View commit details
  3. fix fareto_debug docs

    mattwigway committed Jun 11, 2024
    Copy the full SHA
    bac9083 View commit details

Commits on Jun 12, 2024

  1. Copy the full SHA
    a25bae5 View commit details
  2. Copy the full SHA
    03bcdcf View commit details

Commits on Jun 24, 2024

  1. Copy the full SHA
    340f789 View commit details
  2. typos

    rafapereirabr committed Jun 24, 2024
    Copy the full SHA
    1f9b879 View commit details
  3. tests

    rafapereirabr committed Jun 24, 2024
    Copy the full SHA
    bb9fd22 View commit details
  4. Copy the full SHA
    7f01f07 View commit details

Commits on Jul 17, 2024

  1. Update README.md

    rafapereirabr authored Jul 17, 2024
    Copy the full SHA
    ba0e65d View commit details

Commits on Jul 19, 2024

  1. Update DESCRIPTION

    rafapereirabr authored Jul 19, 2024
    Copy the full SHA
    22a33c3 View commit details

Commits on Aug 27, 2024

  1. fixed typo

    rafapereirabr committed Aug 27, 2024
    Copy the full SHA
    6854c58 View commit details
  2. suggests rJavaEnv

    rafapereirabr committed Aug 27, 2024
    Copy the full SHA
    3aaa639 View commit details
  3. Copy the full SHA
    f3606fd View commit details
  4. Copy the full SHA
    934c4ac View commit details

Commits on Oct 8, 2024

  1. Copy the full SHA
    2fcee5c View commit details

Commits on Oct 9, 2024

  1. typo

    rafapereirabr committed Oct 9, 2024
    Copy the full SHA
    5dbfeff View commit details
  2. link

    rafapereirabr committed Oct 9, 2024
    Copy the full SHA
    a26243b View commit details
  3. typo

    rafapereirabr committed Oct 9, 2024
    Copy the full SHA
    fe9a65c View commit details
  4. Copy the full SHA
    ca82f12 View commit details

Commits on Oct 10, 2024

  1. Copy the full SHA
    a5428ea View commit details
  2. cmd check on cran

    rafapereirabr committed Oct 10, 2024
    Copy the full SHA
    dd8e28f View commit details
  3. description

    rafapereirabr committed Oct 10, 2024
    Copy the full SHA
    90db885 View commit details

Commits on Oct 11, 2024

  1. cmd check check

    rafapereirabr committed Oct 11, 2024
    Copy the full SHA
    4e204ec View commit details
  2. cmd check from sf

    rafapereirabr committed Oct 11, 2024
    Copy the full SHA
    37fe8c6 View commit details

Commits on Dec 12, 2024

  1. update pkgdown website

    rafapereirabr committed Dec 12, 2024
    Copy the full SHA
    f7286fb View commit details

Commits on Dec 13, 2024

  1. Copy the full SHA
    c2e8abe View commit details
  2. docs

    rafapereirabr committed Dec 13, 2024
    Copy the full SHA
    4a929d2 View commit details

Commits on Jan 17, 2025

  1. bump dev version

    dhersz committed Jan 17, 2025
    Copy the full SHA
    24df767 View commit details
  2. Copy the full SHA
    3fa6639 View commit details
  3. updates pkgdown action

    dhersz committed Jan 17, 2025
    Copy the full SHA
    682105e View commit details
  4. updating actions

    dhersz committed Jan 17, 2025
    Copy the full SHA
    6268ebd View commit details

Commits on Feb 5, 2025

  1. Copy the full SHA
    5e6351b View commit details
  2. Copy the full SHA
    a7f2e92 View commit details
  3. Copy the full SHA
    fc246b3 View commit details

Commits on Mar 7, 2025

  1. prep to v2.1.0

    rafapereirabr committed Mar 7, 2025
    Copy the full SHA
    063311d View commit details

Commits on Mar 8, 2025

  1. v2.1.0 Closes #326

    rafapereirabr committed Mar 8, 2025
    Copy the full SHA
    005f5df View commit details
Showing with 733 additions and 397 deletions.
  1. +11 −44 .github/workflows/R-CMD-check-CRAN.yaml
  2. +25 −62 .github/workflows/R-CMD-check.yaml
  3. +11 −40 .github/workflows/pkgdown.yaml
  4. +24 −36 .github/workflows/test-coverage.yaml
  5. +19 −20 README.md
  6. +57 −0 java-r5rcore/src/org/ipea/r5r/Process/FaretoDebug.java
  7. +9 −2 java-r5rcore/src/org/ipea/r5r/R5/R5ParetoServer.java
  8. +25 −0 java-r5rcore/src/org/ipea/r5r/R5RCore.java
  9. +6 −5 r-package/DESCRIPTION
  10. +2 −0 r-package/NAMESPACE
  11. +8 −0 r-package/NEWS.md
  12. +9 −4 r-package/R/accessibility.R
  13. +6 −0 r-package/R/detailed_itineraries.R
  14. +6 −0 r-package/R/expanded_travel_time_matrix.R
  15. +123 −35 r-package/R/isochrone.R
  16. +6 −0 r-package/R/pareto_frontier.R
  17. +5 −2 r-package/R/r5r.R
  18. +6 −0 r-package/R/travel_time_matrix.R
  19. +24 −0 r-package/R/utils.R
  20. +10 −25 r-package/cran-comments.md
  21. BIN r-package/inst/jar/r5r.jar
  22. +4 −2 r-package/man/accessibility.Rd
  23. +3 −1 r-package/man/expanded_travel_time_matrix.Rd
  24. +64 −21 r-package/man/isochrone.Rd
  25. +1 −0 r-package/man/r5r.Rd
  26. +3 −1 r-package/man/roxygen/templates/draws_per_minute.R
  27. +3 −1 r-package/man/travel_time_matrix.Rd
  28. +5 −2 r-package/pkgdown/_pkgdown.yml
  29. +1 −0 r-package/r5r.Rproj
  30. +55 −0 r-package/tests/tests_rafa/isochrone_lines.R
  31. +43 −0 r-package/tests/tests_rafa/line_mid_point.R
  32. +5 −1 r-package/tests/tests_rafa/test_rafa.R
  33. +47 −46 r-package/tests/testthat/test-accessibility.R
  34. +11 −0 r-package/tests/testthat/test-detailed_itineraries.R
  35. +12 −0 r-package/tests/testthat/test-expanded_travel_time_matrix.R
  36. +18 −4 r-package/tests/testthat/test-isochrone.R
  37. +11 −0 r-package/tests/testthat/test-pareto_frontier.R
  38. +11 −15 r-package/tests/testthat/test-travel_time_matrix.R
  39. +36 −19 r-package/vignettes/r5r.Rmd
  40. +7 −7 r-package/vignettes/references.json
  41. +1 −2 r-package/vignettes/time_window.Rmd
55 changes: 11 additions & 44 deletions .github/workflows/R-CMD-check-CRAN.yaml
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@ on:
push:
paths:
- r-package/**
- .github/workflows/R-CMD-check-CRAN.yaml
branches:
- main
- master
- dev
pull_request:
paths:
- r-package/**
- .github/workflows/R-CMD-check-CRAN.yaml
branches:
- main
- master
- dev

name: R-CMD-check-as-CRAN
name: R-CMD-check-CRAN

jobs:
R-CMD-check:
@@ -28,10 +28,9 @@ jobs:
fail-fast: false
matrix:
config:
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-22.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

@@ -44,47 +43,15 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "../.github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), "../.github/R-version")
shell: Rscript {0}
working-directory: r-package

- name: Cache R packages
uses: actions/cache@v2
- uses: r-lib/actions/setup-r-dependencies@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
working-directory: r-package

- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("rcmdcheck")
shell: Rscript {0}
working-directory: r-package
extra-packages: any::rcmdcheck
needs: check
working-directory: r-package

- name: Check
- uses: r-lib/actions/check-r-package@v2
with:
working-directory: r-package
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
NOT_CRAN: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}
working-directory: r-package

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
87 changes: 25 additions & 62 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
on:
push:
paths:
- r-package/**
- .github/workflows/R-CMD-check.yaml
branches:
- main
- master
- dev
pull_request:
paths:
- r-package/**
- .github/workflows/R-CMD-check.yaml
branches:
- main
- master
- dev

@@ -29,16 +26,13 @@ jobs:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: windows-latest, r: 'oldrel'}
- {os: macOS-latest, r: 'release'}
- {os: macOS-latest, r: 'oldrel'}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-22.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"}
- {os: ubuntu-22.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"}
- {os: ubuntu-22.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest"}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

@@ -51,60 +45,29 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2

- name: Java setup
uses: actions/setup-java@v2
# Java setup for macOS (using the proper arm64 architecture)
- name: Java setup (macOS)
if: runner.os == 'macOS'
uses: actions/setup-java@v3
with:
distribution: 'temurin'
distribution: temurin
java-version: '21'
architecture: arm64

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "../.github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), "../.github/R-version")
shell: Rscript {0}
working-directory: r-package

- name: Cache R packages
if: runner.os != 'Windows'
uses: actions/cache@v2
# Java setup for non-macOS runners
- name: Java setup (non-macOS)
if: runner.os != 'macOS'
uses: actions/setup-java@v3
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies (Linux)
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
working-directory: r-package

- name: Install system dependencies (MacOS)
if: runner.os == 'macOS'
run: |
brew install pkg-config gdal proj geos
working-directory: r-package

- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("rcmdcheck")
shell: Rscript {0}
working-directory: r-package
distribution: temurin
java-version: '21'

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}
working-directory: r-package
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check
working-directory: r-package

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
- uses: r-lib/actions/check-r-package@v2
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
working-directory: r-package
51 changes: 11 additions & 40 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -11,9 +11,8 @@ name: pkgdown

jobs:
pkgdown:
runs-on: ubuntu-20.04
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2

@@ -27,49 +26,21 @@ jobs:
java-version: '21'
java-package: jdk

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "../.github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), "../.github/R-version")
shell: Rscript {0}
working-directory: r-package

- name: Cache R packages
uses: actions/cache@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
sudo apt install libharfbuzz-dev libfribidi-dev
working-directory: r-package

- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
install.packages("pkgdown")
shell: Rscript {0}
working-directory: r-package

- name: Copy README.md to r-package/index.md
run: cp README.md r-package/index.md

- name: Update r-package/index.md figures source
run: sed -i 's/\"r-package\//\"/g' r-package/index.md

- name: Install package
run: R CMD INSTALL .
working-directory: r-package
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website
working-directory: r-package

- name: Deploy package
- name: Build and deploy pkgdown site
run: |
git config --local user.email "actions@github.com"
git config --local user.name "GitHub Actions"
Rscript -e 'pkgdown::deploy_to_branch(pkg = "./r-package", new_process = FALSE)'
git config --local user.email "actions@github.com"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
working-directory: r-package
60 changes: 24 additions & 36 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -2,70 +2,58 @@ on:
push:
paths:
- r-package/**
- .github/workflows/test-coverage.yaml
branches:
- dev
- main
- master
pull_request:
paths:
- r-package/**
- .github/workflows/test-coverage.yaml
branches:
- dev
- main
- master

name: test-coverage

jobs:
test-coverage:
runs-on: ubuntu-20.04
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v2

- uses: r-lib/actions/setup-pandoc@v1

- name: Java setup
uses: actions/setup-java@v1
with:
java-version: '21'
java-package: jdk

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "../.github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), "../.github/R-version")
shell: Rscript {0}
working-directory: r-package

- name: Cache R packages
uses: actions/cache@v2
- uses: r-lib/actions/setup-r-dependencies@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
working-directory: r-package
extra-packages: any::covr, any::xml2
needs: coverage
working-directory: r-package

- name: Install dependencies
- name: Test coverage
run: |
install.packages(c("remotes"))
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("covr")
cov <- covr::package_coverage(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
covr::to_cobertura(cov)
shell: Rscript {0}
working-directory: r-package

- name: Test coverage
run: covr::codecov()
shell: Rscript {0}
working-directory: r-package
- uses: codecov/codecov-action@v4
with:
# Fail if error if not on PR, or if on PR and token is given
fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
file: ./cobertura.xml
plugin: noop
disable_search: true
token: ${{ secrets.CODECOV_TOKEN }}
working-directory: r-package
Loading