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

detection_range_model function #162

Merged
merged 124 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
efe5c53
First commit of detection_range_model
benjaminhlina Mar 3, 2021
b11e8b0
Ammened documentation to be reflective of what the function does, arg…
benjaminhlina Mar 11, 2021
dbd04aa
Ammeneded documetnation and default model selection
benjaminhlina Mar 11, 2021
5249c2f
sample detection efficency data used for detection_efficiency_model
benjaminhlina Mar 11, 2021
3b4def9
Detection_efficency_model documentation
benjaminhlina Mar 11, 2021
939b226
updated namespace to include detection_range_model
benjaminhlina Mar 11, 2021
9305a50
current unit test's for detection_range_model need to build more robu…
benjaminhlina Mar 11, 2021
16a802d
Added warnings to polynomial model_frame argument.
benjaminhlina Mar 12, 2021
455dfd2
Added help page for sample detection efficiency dataset
benjaminhlina Mar 13, 2021
2fac02e
Added .rd file for sample detection efficiency dataset
benjaminhlina Mar 13, 2021
64be528
Updated Tests to include testing for warming when model_frame is supp…
benjaminhlina Mar 13, 2021
8ec66eb
Merge branch 'master' into 'detection_range_model'
benjaminhlina Nov 26, 2021
1935079
detection_range_model function, with sample data, and the correspondi…
benjaminhlina May 17, 2023
3ef34d8
Change name off terms for polynomial as the traditional form of ax^3 …
benjaminhlina May 17, 2023
360f3b8
Merge branch 'dev' into detection_range_model
jdpye Jan 6, 2024
daa77fe
Update documentation
jdpye Jan 6, 2024
bb7ac2f
Merge branch 'ocean-tracking-network:main' into main
benjaminhlina Feb 28, 2024
5e1aa90
renamed example
benjaminhlina Feb 28, 2024
8ad7dbe
updated namespace and roxygen
benjaminhlina Feb 28, 2024
9c799b6
ignore ign/doc
benjaminhlina Feb 28, 2024
1e5f75d
new pull of glatos
benjaminhlina Feb 28, 2024
091ec06
comitt new desceription
benjaminhlina Feb 28, 2024
a4d7aa2
fixed description file
benjaminhlina Feb 28, 2024
69ed09d
again fix the merge issues I had with old committ description file
benjaminhlina Feb 28, 2024
7091141
data requirement and loading vignettes
benjaminhlina Mar 1, 2024
17abf66
remove html vignettes and R
benjaminhlina Mar 1, 2024
4336d01
updated unit tests to expect warnings from the test models
benjaminhlina Mar 4, 2024
6bf321c
Update documentation for detection_range_model
benjaminhlina Mar 4, 2024
36341c6
Intial committ of det range vignette
benjaminhlina Mar 4, 2024
c1708ea
intial committ of html of det range
benjaminhlina Mar 4, 2024
8d48931
Some general formatting and step processes edited
benjaminhlina Mar 5, 2024
128cc26
Updated how the RMD renderds
benjaminhlina Mar 5, 2024
9c3baaf
Fix some minor spelling/update writing
benjaminhlina Mar 5, 2024
4d440c3
Add in model plots using ggplot
benjaminhlina Mar 5, 2024
1a47d49
update text and add in intiall deployment
benjaminhlina Mar 5, 2024
dcb5850
Update minor formatting and remove PDF render since I can't getit to …
benjaminhlina Mar 5, 2024
36d59a4
updated HTML for det range model
benjaminhlina Mar 5, 2024
1aa0213
Finished vignette, added the intial deployment section and the redepl…
benjaminhlina Mar 5, 2024
7c4e999
Updated html of detection range vignette
benjaminhlina Mar 5, 2024
05fff7f
Merge branch 'dev' into detection_range_model
jdpye Mar 5, 2024
6e46164
renamed vignette to follow naming standards
benjaminhlina Mar 5, 2024
808782f
Updated vignette naming to align properly
benjaminhlina Mar 5, 2024
88c83e3
Update documentation
jdpye Mar 5, 2024
c1bb558
Update documentation
benjaminhlina Mar 5, 2024
65b1be6
updated description file
benjaminhlina Mar 5, 2024
d078ff9
Merge branch 'detection_range_model' of https://github.com/benjaminhl…
benjaminhlina Mar 5, 2024
1280519
Updated r build ignrome news, and vignettes
benjaminhlina Mar 5, 2024
020e846
Style code (GHA)
benjaminhlina Mar 5, 2024
4f1d370
Updated News to fit DEV
benjaminhlina Mar 5, 2024
df14d2c
Made sure summarize_detection was dev branch version
benjaminhlina Mar 5, 2024
9630a12
Merge pull request #1 from benjaminhlina/main
benjaminhlina Mar 5, 2024
9ceac26
Update documentation
benjaminhlina Mar 5, 2024
9897754
Merge pull request #221 from benjaminhlina/main
benjaminhlina Mar 5, 2024
4253992
Update documentation
benjaminhlina Mar 5, 2024
d7d7a83
Added mapview to allow for range efficiency vignette to build
benjaminhlina Mar 5, 2024
a6e42ee
GH Style updated
benjaminhlina Mar 5, 2024
25119e2
Removed conficting summarize detection sections
benjaminhlina Mar 5, 2024
7ff0f4f
Removed conficting summarize detection sections that were causing doc…
benjaminhlina Mar 5, 2024
b228a73
Style code (GHA)
benjaminhlina Mar 5, 2024
d84717a
added info in example
benjaminhlina Mar 5, 2024
c0c6281
Merge branch 'main' of https://github.com/benjaminhlina/glatos into main
benjaminhlina Mar 5, 2024
042d816
Style code (GHA)
benjaminhlina Mar 5, 2024
acbd993
reformat data_loading vignette
benjaminhlina Mar 5, 2024
3437757
Updated help page examples to be formatted properly
benjaminhlina Mar 5, 2024
5b2eb87
Updated detection effiency vignette
benjaminhlina Mar 5, 2024
cc61993
Removed expect_warning as it was saving the model object as a string …
benjaminhlina Mar 5, 2024
4ab6768
Style code (GHA)
benjaminhlina Mar 5, 2024
d67ed13
Changed vignette index entry as it was not coming throuhg properly
benjaminhlina Mar 5, 2024
89d0c93
Merge branch 'main' of https://github.com/benjaminhlina/glatos into main
benjaminhlina Mar 5, 2024
4a84908
Minor formatting changes to manual
benjaminhlina Mar 6, 2024
addfbf3
Style code (GHA)
benjaminhlina Mar 6, 2024
554ece2
Merge pull request #2 from benjaminhlina/main
benjaminhlina Mar 6, 2024
495ba77
Update documentation
benjaminhlina Mar 6, 2024
f9a4791
Merge branch 'detection_range_model' into detection_range_model
benjaminhlina Mar 6, 2024
1b97634
Merge pull request #222 from benjaminhlina/detection_range_model
benjaminhlina Mar 6, 2024
e3391ba
Updated the DESCRIPTION file to make the devtools::document() from st…
benjaminhlina Mar 7, 2024
d723394
added expect warning
benjaminhlina Mar 7, 2024
75eafe0
Updated minor spelling issues and started adding how to calcualte usi…
benjaminhlina Mar 7, 2024
b6da632
The vigentte follows the same changes
benjaminhlina Mar 7, 2024
556e772
Merge branch 'detection_range_model' of https://github.com/benjaminhl…
benjaminhlina Mar 7, 2024
c3a1b1d
Added expect_warning() in front of the m, m1, m2, and m3 as all produ…
benjaminhlina Mar 7, 2024
faf5826
Removed the last bit of the vignette that I had just pushed as it was…
benjaminhlina Mar 7, 2024
43d8e74
Style code (GHA)
benjaminhlina Mar 7, 2024
78a3708
Merge pull request #224 from benjaminhlina/detection_range_model
benjaminhlina Mar 7, 2024
2f763a9
update detection range vignette html with minor formating changes
benjaminhlina Mar 8, 2024
27a1957
Moved mapview from depenedency to suggests
benjaminhlina Mar 8, 2024
a306643
Merge pull request #225 from benjaminhlina/detection_range_model
benjaminhlina Mar 8, 2024
d236e83
Removed mapview from imports
benjaminhlina Mar 18, 2024
eaf6720
Merge pull request #226 from benjaminhlina/detection_range_model
benjaminhlina Mar 18, 2024
eee56b2
CRAN check
benjaminhlina Sep 5, 2024
905a49a
yml issue
benjaminhlina Sep 5, 2024
d79785a
space
benjaminhlina Sep 5, 2024
c98e5fc
Remove all togeteher
benjaminhlina Sep 5, 2024
8bafb70
Remove yaml...sorry
benjaminhlina Sep 5, 2024
fda6211
Minor spelling and gramatic corrections
benjaminhlina Sep 17, 2024
a811c5e
Initial commit of R file of detection-range vignette
benjaminhlina Sep 17, 2024
6aa5e07
Updated Roxygen version number
benjaminhlina Sep 17, 2024
cfe6eed
Added new section about preliminary calcualting detection efficiencey…
benjaminhlina Sep 17, 2024
ca0fdd1
Merge pull request #244 from benjaminhlina/detection_range_model
benjaminhlina Sep 17, 2024
9634777
Style code (GHA)
benjaminhlina Sep 17, 2024
49e5ff3
Added R CMD Check back in
benjaminhlina Sep 18, 2024
9d6ba3c
Merge pull request #245 from benjaminhlina/detection_range_model
benjaminhlina Sep 18, 2024
85482b6
resolve merge conflicts and version up dev 0.8.9012
chrisholbrook Sep 18, 2024
c29fd07
Merge remote-tracking branch 'origin/detection_range_model' into dev_…
chrisholbrook Sep 18, 2024
3944a2c
resolve R CMD CHECK notes; mostly namespace issues
chrisholbrook Sep 18, 2024
1d617f3
restore R CMD CHECK action
chrisholbrook Sep 18, 2024
f0508cb
Hardcoded the date the vignette was updated on
benjaminhlina Sep 19, 2024
fdd8f4c
Added eval = false, and echo = TRUE for the chunk where the location …
benjaminhlina Sep 19, 2024
fdb8937
Added section where rcv_osc_sf_12 is re created considering the secti…
benjaminhlina Sep 19, 2024
53e1e95
Edited Redploy to Redeploy
benjaminhlina Sep 19, 2024
981efd3
Replaced buffer_rings_pts with redploy_loc_pts
benjaminhlina Sep 19, 2024
9f0c7a0
Capatlized Y on you right after Congatulations!
benjaminhlina Sep 19, 2024
052831e
Style code (GHA)
benjaminhlina Sep 19, 2024
89e2499
Added ggplot, mapview and purrr to description file
benjaminhlina Sep 19, 2024
41dc667
Updated R and HTML for detection_efficiency_vignette the complements …
benjaminhlina Sep 19, 2024
499c01a
removed tibble
benjaminhlina Sep 19, 2024
a975159
Changed version number and date, removed magritter, tidyr and moved m…
benjaminhlina Sep 19, 2024
c5a954b
Merge branch 'detection_range_model' into detection_range_model
benjaminhlina Sep 19, 2024
d952961
Merge pull request #247 from benjaminhlina/detection_range_model
benjaminhlina Sep 19, 2024
3b8988f
Merge pull request #246 from ocean-tracking-network/dev
chrisholbrook Sep 19, 2024
a7d580f
merge main; resolve conflicts
chrisholbrook Sep 20, 2024
39e9721
workarounds for warnings (st_cast) and errors (write.xlsx, st_write)
chrisholbrook Sep 20, 2024
6525afd
sneak detection_range_model into 0.8.0
chrisholbrook Sep 20, 2024
823d52e
Style code (GHA)
chrisholbrook Sep 20, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ doc
*Icon*
/doc/
/Meta/
inst/doc
106 changes: 55 additions & 51 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,51 +1,55 @@
Package: glatos
Type: Package
Title: A package for the Great Lakes Acoustic Telemetry Observation System
Description: Functions useful to members of the Great Lakes Acoustic Telemetry Observation System https://glatos.glos.us; many more broadly relevant to simulating, processing, analysing, and visualizing acoustic telemetry data.
Version: 0.8.0
Date: 2024-09-18
Depends: R (>= 3.6.0)
Imports:
av,
data.table,
dplyr,
geodist,
gdistance,
jsonlite,
lubridate,
plotrix,
raster,
readxl,
sf,
sp,
zip
Suggests:
vdiffr,
gifski,
knitr,
methods,
png,
rmarkdown,
terra,
testthat (>= 3.0.0),
tint
URL: https://github.com/ocean-tracking-network/glatos
BugReports: https://github.com/ocean-tracking-network/glatos/issues
Authors@R: c(
person("Christopher", "Holbrook", email = "[email protected]",
role = c("cre", "aut")),
person("Todd", "Hayden", role = "aut"),
person("Thomas", "Binder", role = "aut"),
person("Jon", "Pye", role = "aut"),
person("Mike", "O'Brien", role = "ctb"),
person("Alex", "Nunes", role = "ctb"),
person("Angela", "Dini", role = "ctb"),
person("Ryan", "Gosse", role = "ctb"))
License: GPL-2
LazyLoad: yes
LazyData: true
RoxygenNote: 7.3.2
VignetteBuilder: knitr
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
Config/testthat/edition: 3
Package: glatos
Type: Package
Title: A package for the Great Lakes Acoustic Telemetry Observation System
Description: Functions useful to members of the Great Lakes Acoustic Telemetry Observation System https://glatos.glos.us; many more broadly relevant to simulating, processing, analysing, and visualizing acoustic telemetry data.
Version: 0.8.0
Date: 2024-09-19
Depends: R (>= 3.6.0)
Imports:
av,
data.table,
dplyr,
geodist,
gdistance,
jsonlite,
lubridate,
plotrix,
raster,
readxl,
sf,
sp,
zip
Suggests:
vdiffr,
ggplot2,
gifski,
knitr,
mapview,
methods,
png,
purrr,
rmarkdown,
terra,
testthat (>= 3.0.0),
tint
URL: https://github.com/ocean-tracking-network/glatos
BugReports: https://github.com/ocean-tracking-network/glatos/issues
Authors@R: c(
person("Christopher", "Holbrook", email = "[email protected]",
role = c("cre", "aut")),
person("Todd", "Hayden", role = "aut"),
person("Thomas", "Binder", role = "aut"),
person("Jon", "Pye", role = "aut"),
person("Mike", "O'Brien", role = "ctb"),
person("Alex", "Nunes", role = "ctb"),
person("Benjamin", "Hlina", role = "ctb"),
person("Angela", "Dini", role = "ctb"),
person("Ryan", "Gosse", role = "ctb"))
License: GPL-2
LazyLoad: yes
LazyData: true
RoxygenNote: 7.3.2
VignetteBuilder: knitr
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
Config/testthat/edition: 3
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export(crw_in_polygon)
export(detect_transmissions)
export(detection_bubble_plot)
export(detection_events)
export(detection_range_model)
export(false_detections)
export(format_POSIXt)
export(get_local_vdat_template)
Expand Down
9 changes: 6 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----

# glatos 0.8.9011 (2024-09-18)
# glatos 0.8.0 (2024-09-19)


## Breaking changes
Expand Down Expand Up @@ -81,7 +81,7 @@ from earlier versions.
- fixes [issue #126](https://github.com/ocean-tracking-network/glatos/issues/126)
- fixes [issue #78](https://github.com/ocean-tracking-network/glatos/issues/78)

- New function `jarasterize()` to allow rasterization
- Add new function `jarasterize()` to allow rasterization
(esp. with `all_touched = TRUE`) using only `sf` and `raster`.
Used by `make_transition()`.

Expand All @@ -91,6 +91,10 @@ from earlier versions.
- In `make_frames()`, allow `terra::SpatVector` input for background map
(`bg_map` arg).
- add test for `terra::SpatVector` input

- Add new function `detection_range_model()` for estimating detection range at
which a certain detection efficiency is expected, using output from
Innovasea's range testing software.


### Bug fixes and minor changes
Expand Down Expand Up @@ -712,4 +716,3 @@ with previous.
#### 2017-03-01

### - initial release on OTN gitlab

24 changes: 23 additions & 1 deletion R/data.r
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
#'
"range_detection"


#' A schema for Innovasea Fathom (VDAT) CSV files
#'
#' A schema for Innovasea Fathom (VDAT) CSV files, produced by 'vdat.exe'
Expand All @@ -137,3 +136,26 @@
#' @author C. Holbrook
#'
"vdat_csv_schema"

#' Detection Efficiency data set
#'
#' Sample detection efficiency data set from Lake Papineau, Quebec, Canada.
#'
#' @details Data is from a preliminary range test, where tags were deployed at
#' set distances away from a VR2W receiver for 24 hours. Once downloaded the vrl
#' files were used in Vemco's Range Testing Software to produced this dataset.
#'
#' @format A data frame with 7 rows and 5 variables
#' \describe{
#' \item{distance_m}{distance away from the receiver in meters}
#' \item{avg_percent}{average detection efficiency}
#' \item{std_dev}{standard deviation of detection efficiency}
#' \item{avg_percent_d}{average detection efficiency in decimal form needs
#' to be created by dividing \code{avg_percent} by 100}
#' \item{intercept}{y-intercept used for third order polynomial, set at 100.
#' Needs to be added to the original dataframe}
#' }
#'
#' @source B.L. Hlina
#'
"sample_detection_efficiency"
Loading