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

v1.2.4 #34

Merged
merged 9 commits into from
Feb 10, 2021
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
relax pre-flight checks for ping_type='sbi'
  • Loading branch information
baktoft committed Feb 1, 2021
commit bb9c6bf27c63d29a2ecd8792d0116e98cfd560a1
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: yaps
Title: Track Estimation using YAPS (Yet Another Positioning Solver)
Version: 1.2.3.9002
Version: 1.2.3.9003
Authors@R: c( person("Henrik", "Baktoft", email = "hba@aqua.dtu.dk", role = c("cre", "aut"), comment=c(ORCID = "0000-0002-3644-4960")),
person("Karl", "Gjelland", role=c("aut")),
person("Uffe H.", "Thygesen", role=c("aut")),
7 changes: 5 additions & 2 deletions R/checkInp.R
Original file line number Diff line number Diff line change
@@ -6,8 +6,11 @@
checkInp <- function(inp){

# check that all BIs are in range of values in the model
stopifnot(inp$datTmb$rbi_min <= min(diff(inp$params$top)))
stopifnot(inp$datTmb$rbi_max >= max(diff(inp$params$top)))
# only relevant for ping_types 'rbi' and 'pbi'?
if(inp$datTmb$pingType != 'sbi'){
stopifnot(inp$datTmb$rbi_min <= min(diff(inp$params$top)))
stopifnot(inp$datTmb$rbi_max >= max(diff(inp$params$top)))
}

stopifnot(ncol(inp$datTmb$toa) == inp$datTmb$np)
stopifnot(nrow(inp$datTmb$toa) == inp$datTmb$nh)
2 changes: 1 addition & 1 deletion R/runYaps.R
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ runYaps <- function(inp, maxIter=1000, getPlsd=TRUE, getRep=TRUE, silent=TRUE, o
TMB::newtonOption(obj, smartsearch=FALSE)
}

if(opt_controls[['use_bounds']]){
if( !is.null(opt_controls[['use_bounds']])){
lower <- opt_controls[['lower']]
upper <- opt_controls[['upper']]
opt_controls <- list()