Skip to content

Commit

Permalink
Merge pull request #17 from g-rppl/dev
Browse files Browse the repository at this point in the history
version 3.2
  • Loading branch information
g-rppl authored Jun 4, 2024
2 parents 0e5e447 + 687bd40 commit bfe9321
Show file tree
Hide file tree
Showing 23 changed files with 313 additions and 259 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
^TODO\.md$
^doc$
^Meta$
^LICENSE\.md$
120 changes: 60 additions & 60 deletions .github/workflows/R-CMD-check.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main]
pull_request:
branches: [main]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- { os: macOS-latest, r: "release", rtools: "" }
- { os: windows-latest, r: "release", rtools: "43" }
- {
os: ubuntu-latest,
r: "devel",
http-user-agent: "release",
rtools: "",
}
- { os: ubuntu-latest, r: "release", rtools: "" }
- { os: ubuntu-latest, r: "oldrel-1", rtools: "" }

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
extra-repositories: 'https://mc-stan.org/r-packages/'
rtools-version: ${{ matrix.config.rtools }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- name: Build Cmdstan
shell: Rscript {0}
run: |
cmdstanr::check_cmdstan_toolchain(fix = TRUE)
cmdstanr::install_cmdstan(cores = parallel::detectCores())
- uses: r-lib/actions/check-r-package@v2
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main]
pull_request:
branches: [main]

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- { os: macOS-latest, r: "release", rtools: "" }
- { os: windows-latest, r: "release", rtools: "43" }
- {
os: ubuntu-latest,
r: "devel",
http-user-agent: "release",
rtools: "",
}
- { os: ubuntu-latest, r: "release", rtools: "" }
- { os: ubuntu-latest, r: "oldrel-1", rtools: "" }

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
extra-repositories: "https://stan-dev.r-universe.dev"
rtools-version: ${{ matrix.config.rtools }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- name: Build Cmdstan
shell: Rscript {0}
run: |
cmdstanr::check_cmdstan_toolchain(fix = TRUE)
cmdstanr::install_cmdstan(cores = parallel::detectCores())
- uses: r-lib/actions/check-r-package@v2
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
extra-repositories: "https://mc-stan.org/r-packages/"
extra-repositories: "https://stan-dev.r-universe.dev"

- uses: r-lib/actions/setup-r-dependencies@v2
with:
Expand Down
76 changes: 38 additions & 38 deletions .github/workflows/test-coverage.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main]
pull_request:
branches: [main]

name: test-coverage

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

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
extra-repositories: "https://mc-stan.org/r-packages/"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr
needs: coverage

- name: Build Cmdstan
shell: Rscript {0}
run: |
cmdstanr::check_cmdstan_toolchain(fix = TRUE)
cmdstanr::install_cmdstan(cores = parallel::detectCores())
- name: Test coverage
run: covr::codecov(quiet = FALSE)
shell: Rscript {0}
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main]
pull_request:
branches: [main]

name: test-coverage

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

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
extra-repositories: "https://stan-dev.r-universe.dev"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr
needs: coverage

- name: Build Cmdstan
shell: Rscript {0}
run: |
cmdstanr::check_cmdstan_toolchain(fix = TRUE)
cmdstanr::install_cmdstan(cores = parallel::detectCores())
- name: Test coverage
run: covr::codecov(quiet = FALSE)
shell: Rscript {0}
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Title: Estimate flight tracks from telemetry data
Description: `movetrack` is a `R` package that provides simple functionality
to estimate flight tracks from telemetry data using random walk models written
in Stan.
Version: 0.3.1
Version: 0.3.2
License: MIT + file LICENSE
Authors@R:
person("Georg", "Rüppel", , "[email protected]", role = c("aut", "cre"),
Expand All @@ -19,7 +19,7 @@ Imports:
lubridate,
ggplot2
Additional_repositories:
https://mc-stan.org/r-packages/
https://stan-dev.r-universe.dev
SystemRequirements: CmdStan (https://mc-stan.org/users/interfaces/cmdstan)
Encoding: UTF-8
VignetteBuilder:
Expand All @@ -35,3 +35,4 @@ Suggests:
DiagrammeR,
testthat (>= 3.0.0)
Config/testthat/edition: 3
LazyData: true
23 changes: 2 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,2 @@
MIT License

Copyright (c) 2023 Georg Rüppel <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
YEAR: 2024
COPYRIGHT HOLDER: Georg Rüppel
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# MIT License

Copyright (c) 2024 movetrack authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export(mapTrack)
export(track)
importFrom(HDInterval,hdi)
importFrom(cmdstanr,cmdstan_model)
importFrom(dplyr,any_of)
importFrom(dplyr,arrange)
importFrom(dplyr,bind_cols)
importFrom(dplyr,distinct)
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# movetrack 0.3.2

- `aType` in `locate()` now optional.

# movetrack 0.3.1

### Bug fixes
Expand Down Expand Up @@ -40,6 +44,6 @@

### New features

- Support antenna-specific `det_range`
- Support antenna-specific `aRange`
- Utilisation of Stan's optimisation algorithms
- Support multiple-variable summaries
Loading

0 comments on commit bfe9321

Please sign in to comment.