Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev1.2.1.9000 #30

Merged
merged 44 commits into from
Jan 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4be668d
fix bug in getInpSync() - failed if sync_tag was only heard on own hydro
baktoft May 19, 2020
219682e
add function to fine tune sync_model
baktoft Jun 5, 2020
6c11c73
eliminate estimation of log_sigma_hydros_xy, replax priors on SS, ret…
baktoft Jun 7, 2020
e86c457
change version to 1.2.1.9000
baktoft Jul 2, 2020
6ba9673
add plots of temporal stability of sync_model
baktoft Oct 6, 2020
df77bff
adds bbox-constraint
baktoft Oct 8, 2020
16414be
fix bug in plotBbox()
baktoft Oct 8, 2020
d06acbc
fix global variables warnings in devtools::check()
baktoft Oct 8, 2020
1ba9169
add option to use recorded SS in sync
baktoft Oct 16, 2020
df633f3
updated NEWS.md
baktoft Oct 16, 2020
3890870
fix bug in getting sync_model when ss_data_what=est
baktoft Oct 16, 2020
811ca8d
fix bug in plotSyncModelResids()
baktoft Oct 17, 2020
4a2846d
fix bug in getInpSync() when ignoring specific hydros
baktoft Oct 17, 2020
989dcd1
fix bug if not enough data to produce toa
baktoft Oct 22, 2020
b093759
add checkInpSync()
baktoft Oct 28, 2020
edc9eb5
minor bug fixes according to check() and test()
baktoft Oct 29, 2020
f8ea546
Change from error to warning if sync_coverage$n <= 5
baktoft Oct 29, 2020
25cac5a
add better plot to getSyncCoverage() and include data in inp_sync$syn…
baktoft Oct 29, 2020
48ae72b
add option to use selective downsampling in getInpSync()
baktoft Oct 29, 2020
e3cd9aa
disable auto rerunning getSyncModel when extreme outliers identified
baktoft Oct 30, 2020
2580293
fix tiny bug in getDownsampledToaList()
baktoft Oct 30, 2020
ff6302c
fix bug in applySync() so it now can be applied to a matrix also
baktoft Nov 2, 2020
821d385
fix bug in getSyncCheckDat()
baktoft Nov 2, 2020
d8b7a2d
add plotSyncModelHydros()
baktoft Nov 2, 2020
792d877
fix potential bug in fineTuneSyncModel()
baktoft Nov 2, 2020
cf934fc
add estimation of Z
baktoft Nov 13, 2020
828e9e7
fix nasty bug in likelihood when using ping_type='rbi'
baktoft Jan 10, 2021
17584dc
update NEWS.md and update test ref data
baktoft Jan 10, 2021
052e793
Fix bug in getToaYaps() that allowed too short/too high BI to pass th…
baktoft Jan 10, 2021
46db4b7
fix bug in getToaYaps() for ping_type'sbi'
baktoft Jan 20, 2021
42f1267
add tempToSs()
baktoft Jan 20, 2021
7a7e092
fix check() notes
baktoft Jan 21, 2021
dc67044
fix more check() notes
baktoft Jan 21, 2021
92bdd40
enable travis
baktoft Jan 21, 2021
b27d24a
Revert "enable travis"
baktoft Jan 21, 2021
b2b8709
use github actions instead
baktoft Jan 21, 2021
42bf78e
new ghaction yaml
baktoft Jan 21, 2021
45c0d69
bug fix attempt in github actions
baktoft Jan 21, 2021
b8d3182
setting Matrix == 1.2.18
baktoft Jan 21, 2021
fd09f4f
fix bug related to Matrix v1.3.2 - max_iter need to be much higher wh…
baktoft Jan 21, 2021
1a21785
skip check on macOS devel
baktoft Jan 21, 2021
df1ced9
up version
baktoft Jan 21, 2021
7837bc5
Merge branch 'dev1.2.1.9000' of https://github.com/baktoft/yaps into …
baktoft Jan 21, 2021
3f21091
Merge branch 'master' into dev1.2.1.9000
baktoft Jan 21, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@
^pkgdown$
^index\.Rmd$
^index\.md$
^vignettes$
^vignettes$
^LICENSE\.md$
^LICENSE$
^\.github$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
84 changes: 84 additions & 0 deletions .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# 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, pull_request]

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: windows-latest, r: 'release'}
- {os: windows-latest, r: 'devel'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}

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

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}

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

- 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}

- name: Cache R packages
if: runner.os != 'Windows'
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
if: runner.os == 'Linux'
# env:
# RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
run: |
# # # # custom hack to ensure correct version of Matrix for TMB
# sudo apt-get install -y --allow-downgrades r-cran-matrix=1.2-18-1focal0
# R -e "install.packages('TMB', type = 'source')"
# # # # custom hack end

while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')

- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("rcmdcheck")
shell: Rscript {0}

- 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}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ man/figures/*.png
rsconnect/
.Rproj.user
inst/doc
debug.log
13 changes: 6 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
Package: yaps
Title: Track estimation using YAPS (Yet Another Positioning Solver)
Version: 1.2.0.9112
Title: Track Estimation using YAPS (Yet Another Positioning Solver)
Version: 1.2.2
Authors@R: c( person("Henrik", "Baktoft", email = "[email protected]", role = c("cre", "aut")),
person("Karl", "Gjelland", role=c("aut")),
person("Uffe H.", "Thygesen", role=c("aut")),
person("Finn", "Økland", role=c("aut"))
)
Description: Estimate track from acoustic data using YAPS (doi:10.1038/s41598-017-14278-z).
Description: Estimate track from acoustic data using YAPS.
Depends: R (>= 3.5.0)
License: GPL-3 + file LICENSE
License: GPL-3
Encoding: UTF-8
LazyData: true
RoxygenNote: 6.1.1
RoxygenNote: 7.1.1
LinkingTo: Rcpp, TMB, RcppEigen
Imports: circular, data.table (>= 1.12.8), ggplot2, Matrix, nloptr, plyr, Rcpp, RcppEigen, reshape2, splusTimeSeries, stats, tictoc, TMB, viridis, zoo
Imports: circular, cowplot, data.table, ggplot2, ggrepel, nloptr, plyr, Rcpp, reshape2, splusTimeSeries, stats, tictoc, TMB, viridis, zoo
Suggests:
testthat (>= 2.1.0),
knitr,
rmarkdown
URL: https://github.com/baktoft/yaps
BugReports: https://github.com/baktoft/yaps/issues
VignetteBuilder: knitr
Loading