Merge pull request #28 from poissonconsulting/f-embr

DESCRIPTION

@@ -17,10 +17,10 @@ Imports:
     chk,
     coda,
     dplyr,
+    embr,
     foreach,
     lubridate,
     magrittr,
-    mbr,
     mcmcr,
     plyr,
     purrr,
@@ -44,10 +44,9 @@ LinkingTo:
     TMB
 Remotes: 
     poissonconsulting/bauw,
-    poissonconsulting/mbr,
+    poissonconsulting/embr,
     poissonconsulting/mcmcdata,
     poissonconsulting/newdata,
     poissonconsulting/timer
 Encoding: UTF-8
-LazyData: true
 RoxygenNote: 7.2.3

NAMESPACE

@@ -13,7 +13,7 @@ export(is.tmb_mcmc_analysis)
 export(is.tmb_ml_analysis)
 export(is.tmb_model)
 import(chk)
-import(mbr)
+import(embr)
 import(mcmcr)
 import(rlang)
 import(stringr)

R/analyse.R

@@ -98,7 +98,7 @@ tmb_analysis <- function(data, model, tempfile, glance, quiet) {
 
   if (glance) on.exit(print(glance(obj)))
 
-  data %<>% mbr::modify_data(model = model)
+  data %<>% modify_data(model = model)
 
   inits <- inits(data, model$gen_inits, model$random_effects)
 

R/check.R

@@ -22,7 +22,7 @@ check_model_pars.tmb_code <- function(x, fixed, random, derived, drops) {
 
 check_data_model <- function(data, model) {
   if (is.data.frame(data)) {
-    data %<>% mbr::modify_data(model = model)
+    data %<>% modify_data(model = model)
     inits(data, model$gen_inits, model$random_effects)
   } else
     llply(data, check_data_model, model)

R/confint.R

@@ -9,7 +9,7 @@ profile_confint <- function(term, ad_fun, level = level, ...) {
 adfun_confint <- function(terms, object, tempfile, level, ...) {
   model <- model(object)
   data <- data_set(object) %>%
-    mbr::modify_data(model = model)
+    modify_data(model = model)
 
   inits <- estimates(object, "primary")
   map <- map(inits(data, model$gen_inits, model$random_effects))

R/namespace.R

@@ -1,4 +1,4 @@
-#' @import chk universals mcmcr mbr rlang stringr term
+#' @import chk universals mcmcr embr rlang stringr term
 #' @importFrom coda thin
 #' @importFrom lubridate dminutes is.duration
 #' @importFrom magrittr %<>% %>%