Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Ian Jonsen committed Dec 9, 2022
1 parent 22d8010 commit c591b1d
Show file tree
Hide file tree
Showing 29 changed files with 27 additions and 5,504 deletions.
8 changes: 4 additions & 4 deletions R/join.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
##'
##' @description `join()` joins ssm-predicted locations and mpm-estimated behavioural index into a single tibble. If the ssm-predicted tibble is a projected sf object then the output of join will also be an sf object (default). This can be avoided by using `as_sf = FALSE`.
##'
##' @param ssm a `aniMotum` ssm fitted model object
##' @param mpm a `aniMotum` mpm fitted model object
##' @param ssm an `aniMotum` ssm fitted model object
##' @param mpm an `aniMotum` mpm fitted model object
##' @param what.ssm specifies whether ssm `predicted` or `fitted` values are to be extracted
##' @param as_sf logical; if FALSE then return a tibble with un-projected lonlat
##' coordinates, otherwise return an sf tibble
Expand Down Expand Up @@ -37,8 +37,8 @@ join <- function(ssm,
normalise = FALSE,
group = FALSE) {

if(!inherits(ssm, "ssm_df")) stop("ssm must be a aniMotum ssm fit object with class `ssm_df`")
if(!inherits(mpm, "mpm_df")) stop("mpm must be a aniMotum mpm fit object with class `mpm_df`")
if(!inherits(ssm, "ssm_df")) stop("ssm must be an aniMotum ssm fit object with class `ssm_df`")
if(!inherits(mpm, "mpm_df")) stop("mpm must be an aniMotum mpm fit object with class `mpm_df`")

x <- grab(ssm, what = what.ssm, as_sf = as_sf)
y <- grab(mpm, what = "fitted", normalise = normalise, group = group)
Expand Down
2 changes: 1 addition & 1 deletion aniMotum.Rproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ LaTeX: pdfLaTeX
BuildType: Package
PackageUseDevtools: Yes
PackageInstallArgs: --no-multiarch --with-keep.source
PackageRoxygenize: rd,collate,namespace
PackageRoxygenize: rd,collate,namespace,vignette
69 changes: 0 additions & 69 deletions inst/doc/Mapping.R

This file was deleted.

113 changes: 0 additions & 113 deletions inst/doc/Mapping.Rmd

This file was deleted.

Loading

0 comments on commit c591b1d

Please sign in to comment.