Merge pull request #109 from mrc-ide/dev

CRAN fixes
mrc-ide · Jun 16, 2021 · b3a59ec · b3a59ec
2 parents 68454e9 + 41da083
commit b3a59ec
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 1 deletion.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -13,3 +13,4 @@ docs
 ^Meta$
 codecov.yml
 tests/performance
+joss
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: individual
 Title: Framework for Specifying and Simulating Individual Based Models
-Version: 0.1.1
+Version: 0.1.2
 Authors@R: c(
   person(
     given = "Giovanni",

diff --git a/NAMESPACE b/NAMESPACE
@@ -17,5 +17,6 @@ export(multi_probability_multinomial_process)
 export(reschedule_listener)
 export(simulation_loop)
 export(update_category_listener)
+importFrom(R6,R6Class)
 importFrom(Rcpp,sourceCpp)
 useDynLib(individual, .registration = TRUE)
diff --git a/R/bitset.R b/R/bitset.R
@@ -5,6 +5,7 @@
 #' difference, set difference). 
 #' WARNING: all operations (except \code{$not}) are in-place so please use \code{$copy} 
 #' if you would like to perform an operation without destroying your current bitset.
+#' @importFrom R6 R6Class
 #' @export Bitset
 Bitset <- R6::R6Class(
   'Bitset',

diff --git a/R/categorical_variable.R b/R/categorical_variable.R
@@ -4,6 +4,7 @@
 #' a finite set, such as infection, health, or behavioral state. It should
 #' be used in preference to \code{\link[individual]{IntegerVariable}}
 #' if possible becuase certain operations will be faster.
+#' @importFrom R6 R6Class
 #' @export
 CategoricalVariable <- R6::R6Class(
   'CategoricalVariable',

diff --git a/R/double_variable.R b/R/double_variable.R
@@ -1,5 +1,6 @@
 #' @title DoubleVariable Class
 #' @description Represents a continuous variable for an individual.
+#' @importFrom R6 R6Class
 #' @export
 DoubleVariable <- R6::R6Class(
   'DoubleVariable',

diff --git a/R/event.R b/R/event.R
@@ -1,5 +1,6 @@
 #' @title Event Class
 #' @description Describes a general event in the simulation
+#' @importFrom R6 R6Class
 #' @export
 Event <- R6::R6Class(
   'Event',

diff --git a/R/integer_variable.R b/R/integer_variable.R
@@ -4,6 +4,7 @@
 #' but can be used for variables with unbounded ranges, or other situations where part
 #' of an individual's state is better represented by an integer, such as
 #' household or age bin.
+#' @importFrom R6 R6Class
 #' @export
 IntegerVariable <- R6::R6Class(
   'IntegerVariable',

diff --git a/R/render.R b/R/render.R
@@ -1,5 +1,6 @@
 #' @title Render
 #' @description Class to render output for the simulation
+#' @importFrom R6 R6Class
 #' @export
 Render <- R6::R6Class(
   'Render',

diff --git a/src/Makevars b/src/Makevars
@@ -1 +1,5 @@
 CXX_STD = CXX14
+
+strippedLib: $(SHLIB)
+	if test -e "/usr/bin/strip"; then /usr/bin/strip --strip-debug $(SHLIB); fi
+.phony: strippedLib
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,4 @@ docs @@
     ^Meta$
     codecov.yml
     tests/performance
+    joss