Skip to content

Commit

Permalink
Update centroid -> container terminology and update example datasets …
Browse files Browse the repository at this point in the history
…accordingly (includes normalisation).
  • Loading branch information
edwardlavender committed May 28, 2022
1 parent 95fcbc7 commit dd81cab
Show file tree
Hide file tree
Showing 62 changed files with 785 additions and 782 deletions.
8 changes: 4 additions & 4 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export(acdc_animate_record)
export(acdc_plot_record)
export(acdc_plot_trace)
export(acdc_simplify)
export(acs_setup_centroids)
export(acs_setup_containers)
export(acs_setup_detection_kernels)
export(acs_setup_mobility)
export(assemble_sentinel_counts)
Expand All @@ -34,10 +34,10 @@ export(dist_over_surface)
export(eval_by_kud)
export(get_detection_area_sum)
export(get_detection_area_ts)
export(get_detection_centroids)
export(get_detection_centroids_envir)
export(get_detection_centroids_overlap)
export(get_detection_clumps)
export(get_detection_containers)
export(get_detection_containers_envir)
export(get_detection_containers_overlap)
export(get_detection_days)
export(get_detection_overlaps)
export(get_detection_pr)
Expand Down
38 changes: 19 additions & 19 deletions R/ac.R

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions R/acdc.R

Large diffs are not rendered by default.

132 changes: 66 additions & 66 deletions R/acdc_analyse_record.R

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions R/acdc_classes.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#### acdc_record-class

#' @title "acdc_record" class
#' @description An S3 class that defines the object returned by an acoustic-centroid/depth-contour (AC/DC) algorithm (\code{\link[flapper]{ac}}, \code{\link[flapper]{dc}} or \code{\link[flapper]{acdc}}), after simplification via \code{\link[flapper]{acdc_simplify}} or directly from internal routines.
#' @description An S3 class that defines the object returned by an acoustic-container/depth-contour (AC/DC) algorithm (\code{\link[flapper]{ac}}, \code{\link[flapper]{dc}} or \code{\link[flapper]{acdc}}), after simplification via \code{\link[flapper]{acdc_simplify}} or directly from internal routines.

#' @return \subsection{A named list}{An "acdc_record" class object is a named list with the following elements: `map', `record', `time', `args', `chunks' and `simplify'. The main output element is the `map' RasterLayer that shows where the individual could have spent more or less time over the duration of the movement time series. The `record' element records time-specific maps of the possible locations of the individual, and can be used to plot maps of specific time points or to produce animations (for the time steps specified by the \code{save_record_spatial} argument). The `time' element is a dataframe that defines the times of sequential stages in the algorithm's progression, providing a record of computation time. The `args' element is a named list of user inputs that record the parameters used to generate the outputs (if \code{save_args = TRUE}, otherwise the `args' element is \code{NULL}). The `chunks' element is a list with chunk-specific information that is generated if the algorithm is implemented chunk-wise and then simplified via \code{\link[flapper]{acdc_simplify}} with the \code{keep_chunks = TRUE} argument. The \code{simplify} element is a logical value that defines whether or not the object was created from \code{\link[flapper]{ac}}/\code{\link[flapper]{dc}}/\code{\link[flapper]{acdc}} and \code{\link[flapper]{acdc_simplify}} or an internal routine. Below, more detail about the `map' and `record' elements is provided.}
#'
Expand Down Expand Up @@ -41,12 +41,12 @@
#' \item `map_timestep' is a RasterLayer of all the positions that the individual could have occupied at that time step, given the algorithm;
#' \item `map_cumulative' is a RasterLayer of the cumulative of the number of times when the movement data were compatible with the individual being in that cell, under the specified algorithm, from all previous time steps up to the current time step (i.e., the sum of `map_timestep' across all time steps from the first time step to the current time step) (unless \code{normalise = TRUE} in which case the interpretation differs);
#' }
#' For the AC* algorithms, this list also includes information on the acoustic centroids and location probability:
#' For the AC* algorithms, this list also includes information on the acoustic containers and location probability:
#' \itemize{
#' \item `centroid_ap` is \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location from the perspective of its previous location;
#' \item `centroid_an' is a \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location from the perspective of the receiver that records a detection at the moment of detection (i.e., the detection centroid);
#' \item `centroid_b` is \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location from (A) the perspective of
#' \item `centroid_c` is a \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location at a given time step, accounting for the information provided by previous, current and future locations;
#' \item `container_ap` is \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location from the perspective of its previous location;
#' \item `container_an' is a \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location from the perspective of the receiver that records a detection at the moment of detection (i.e., the detection container);
#' \item `container_b` is \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location from (A) the perspective of
#' \item `container_c` is a \code{\link[sp]{SpatialPolygonsDataFrame}} that defines the boundaries of the individual's location at a given time step, accounting for the information provided by previous, current and future locations;
#' \item `kernel` is a \code{\link[raster]{raster}} that defines location probability across the grid, accounting for the receiver(s) at which an individual was detected and the receiver(s) at which an individual was not detected and receiver arrangement;
#' }
#'
Expand All @@ -65,7 +65,7 @@ NULL
#### acdc_archive-class

#' @title "acdc-archive" class
#' @description An S3 class that defines the object returned by an acoustic-centroid/depth-contour (AC/DC) algorithm (\code{\link[flapper]{ac}}, \code{\link[flapper]{dc}} or \code{\link[flapper]{acdc}}).
#' @description An S3 class that defines the object returned by an acoustic-container/depth-contour (AC/DC) algorithm (\code{\link[flapper]{ac}}, \code{\link[flapper]{dc}} or \code{\link[flapper]{acdc}}).
#'
#' @return An \code{\link[flapper]{acdc_archive-class}} object is a named list that contains the output of a call to \code{\link[flapper]{ac}}, \code{\link[flapper]{dc}} or \code{\link[flapper]{acdc}}. This contains the following elements: `archive', `ts_by_chunk', `time' and `args'.
#'
Expand Down
Loading

0 comments on commit dd81cab

Please sign in to comment.