small update to format_data

Merge branch 'staging' # Conflicts: # DESCRIPTION
ianjonsen · Jan 13, 2025 · 83e4493 · 83e4493
2 parents ce5d028 + ba08cd2
commit 83e4493
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: aniMotum
 Title: Fit Continuous-Time State-Space and Latent Variable Models for Quality Control of Argos Satellite (and Other) Telemetry Data and for Estimating Changes in Animal Movement
-Version: 1.2-07
-Date: 2024-11-07
+Version: 1.2-08
+Date: 2025-01-13
 Authors@R: 
     c(
       person(given = "Ian",

diff --git a/R/format_data.R b/R/format_data.R
@@ -140,6 +140,9 @@ format_data <- function(x,
     }
   }
 
+  ## In case all format_data-added variables already exist in x
+  xx <- x
+
   ## determine if there are extra variables in x
   xt.vars <- names(x)[!names(x) %in% c(id, date, lc, coord, epar, sderr)]
 

diff --git a/R/sim_fit.R b/R/sim_fit.R
@@ -90,6 +90,9 @@ sim_fit <-
   if(!what %in% c("fitted", "predicted")) 
     stop("only `fitted` or `predicted` locations can be simulated from a model fit")
 
+  if(any(sapply(fit$ssm, function(x) x$pm) == "mp"))
+    stop("'mp' process model fit(s) detected\n  tracks can only be simulated from SSM fits using either the 'rw' or 'crw' process models")
+
   if(!is.null(start)) {
     start <- data.frame(lon = start[1], lat = start[2])
     st1 <- st_as_sf(start, coords = c("lon","lat"), crs = 4326) |>
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,6 +140,9 @@ format_data <- function(x, @@
         }
       }
+      ## In case all format_data-added variables already exist in x
+      xx <- x
       ## determine if there are extra variables in x
       xt.vars <- names(x)[!names(x) %in% c(id, date, lc, coord, epar, sderr)]
@@ Expand Down @@