Bootstrap package to generate itself

Author: richfitz

.Rbuildignore

@@ -25,3 +25,4 @@
 ^\.Rproj\.user$
 ^_pkgdown\.yml$
 ^\.gitattributes$
+^inst/dust$

.gitignore

@@ -15,3 +15,4 @@ docs
 .valgrind_ignore
 inst/doc
 pkgdown
+inst/dust

R/cpp11.R

@@ -1,8 +1,7 @@
+## Generated by dust2 (version 0.15.0) - do not edit
 sir <- function() {
   dust_system_generator("sir")
 }
-
-
 walk <- function() {
   dust_system_generator("walk")
 }

R/dust.R

@@ -49,12 +49,11 @@
 dust_package <- function(path, quiet = FALSE) {
   call <- environment()
   ## 1. check that the package is legit
-  desc <- package_validate_root(path, call)
+  pkg <- package_validate_root(path, call)
   path_dust <- file.path(path, "inst/dust")
   path_src <- file.path(path, "src")
   path_r <- file.path(path, "R")
 
-  pkg <- desc$get_field("Package")
   if (!quiet) {
     cli::cli_alert_info("Working in package '{pkg}' at '{path}'")
   }
@@ -112,9 +111,12 @@ package_validate_root <- function(path, call) {
   }
 
   desc <- pkgload::pkg_desc(path)
-  package_validate_has_dep(desc, "dust2", "Imports")
+  pkg <- desc$get_field("Package")
+  if (pkg != "dust2") {
+    package_validate_has_dep(desc, "dust2", "Imports")
+    package_validate_has_dep(desc, "dust2", "LinkingTo")
+  }
   package_validate_has_dep(desc, "cpp11", "LinkingTo")
-  package_validate_has_dep(desc, "dust2", "LinkingTo")
   package_validate_has_dep(desc, "mcstate2", "LinkingTo")
 
   name <- desc$get_field("Package")
@@ -125,7 +127,7 @@ package_validate_root <- function(path, call) {
   }
   package_validate_namespace(file.path(path, "NAMESPACE"), name)
 
-  desc
+  pkg
 }
 
 

R/package.R

@@ -13,6 +13,11 @@ SEXP dust2_discrete_{{name}}_unfilter_run(cpp11::sexp ptr, cpp11::sexp r_pars, c
   return dust2::r::dust2_discrete_unfilter_run<{{class}}>(ptr, r_pars, r_initial, save_history, grouped);
 }
 
+[[cpp11::register]]
+SEXP dust2_discrete_{{name}}_unfilter_last_history(cpp11::sexp ptr, bool grouped) {
+  return dust2::r::dust2_discrete_unfilter_last_history<{{class}}>(ptr, grouped);
+}
+
 [[cpp11::register]]
 SEXP dust2_discrete_{{name}}_filter_alloc(cpp11::list r_pars, cpp11::sexp r_time_start, cpp11::sexp r_time, cpp11::sexp r_dt, cpp11::list r_data, cpp11::sexp r_n_particles, cpp11::sexp r_n_groups, cpp11::sexp r_index, cpp11::sexp r_seed) {
   return dust2::r::dust2_discrete_filter_alloc<{{class}}>(r_pars, r_time_start, r_time, r_dt, r_data, r_n_particles, r_n_groups, r_index, r_seed);
@@ -23,6 +28,11 @@ SEXP dust2_discrete_{{name}}_filter_run(cpp11::sexp ptr, cpp11::sexp r_pars, cpp
   return dust2::r::dust2_discrete_filter_run<{{class}}>(ptr, r_pars, r_initial, save_history, grouped);
 }
 
+[[cpp11::register]]
+SEXP dust2_discrete_{{name}}_filter_last_history(cpp11::sexp ptr, bool grouped) {
+  return dust2::r::dust2_discrete_filter_last_history<{{class}}>(ptr, grouped);
+}
+
 [[cpp11::register]]
 SEXP dust2_discrete_{{name}}_filter_rng_state(cpp11::sexp ptr) {
   return dust2::r::dust2_discrete_filter_rng_state<{{class}}>(ptr);

inst/template/dust_compare.cpp

@@ -4,13 +4,14 @@ examples <- c("sir.cpp", "walk.cpp")
 setwd(here::here())
 unlink(file.path("src", basename(examples)))
 
+unlink("inst/dust", recursive = TRUE)
+dir.create("inst/dust", FALSE)
+stopifnot(all(
+  file.copy(file.path("inst/examples", examples), "inst/dust",
+            overwrite = TRUE)))
 pkgload::load_all()
-path <- withr::with_dir("tests/testthat",
-                        create_test_package(examples = examples))
-path <- dust_package(path, quiet = TRUE)
-file.copy(file.path(path, "R", "dust.R"), "R", overwrite = TRUE)
-unlink(file.path(path, "src", "cpp11.cpp"))
-unlink(file.path(path, "src", "Makevars"))
-file.copy(dir(file.path(path, "src"), full.names = TRUE), "src",
-          overwrite = TRUE)
-cpp11::cpp_register()
+dust_package(".")
+code <- readLines("R/dust.R")
+writeLines(sub("dust2::+", "", code), "R/dust.R")
+
+unlink("inst/dust", recursive = TRUE)