Merge pull request #115 from slwu89/bug/cran_note

get rid of CRAN check NOTEs
mrc-ide · Jul 9, 2021 · de9d1ec · de9d1ec
2 parents 6ae4055 + d3c59a0
commit de9d1ec
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 12 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -14,3 +14,4 @@ docs
 codecov.yml
 tests/performance
 joss
+.vscode
diff --git a/R/bitset.R b/R/bitset.R
@@ -6,8 +6,8 @@
 #' 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(
+#' @export
+Bitset <- R6Class(
   'Bitset',
   public = list(
     #' @field .bitset a pointer to the underlying IterableBitset

diff --git a/R/categorical_variable.R b/R/categorical_variable.R
@@ -6,7 +6,7 @@
 #' if possible becuase certain operations will be faster.
 #' @importFrom R6 R6Class
 #' @export
-CategoricalVariable <- R6::R6Class(
+CategoricalVariable <- R6Class(
   'CategoricalVariable',
   public = list(
 

diff --git a/R/double_variable.R b/R/double_variable.R
@@ -2,7 +2,7 @@
 #' @description Represents a continuous variable for an individual.
 #' @importFrom R6 R6Class
 #' @export
-DoubleVariable <- R6::R6Class(
+DoubleVariable <- R6Class(
   'DoubleVariable',
   public = list(
     .variable = NULL,

diff --git a/R/event.R b/R/event.R
@@ -2,7 +2,7 @@
 #' @description Describes a general event in the simulation
 #' @importFrom R6 R6Class
 #' @export
-Event <- R6::R6Class(
+Event <- R6Class(
   'Event',
   public = list(
 

diff --git a/R/integer_variable.R b/R/integer_variable.R
@@ -6,7 +6,7 @@
 #' household or age bin.
 #' @importFrom R6 R6Class
 #' @export
-IntegerVariable <- R6::R6Class(
+IntegerVariable <- R6Class(
   'IntegerVariable',
   public = list(
 

diff --git a/R/render.R b/R/render.R
@@ -2,7 +2,7 @@
 #' @description Class to render output for the simulation
 #' @importFrom R6 R6Class
 #' @export
-Render <- R6::R6Class(
+Render <- R6Class(
   'Render',
   private = list(
     .vectors = list(),

diff --git a/R/targeted_event.R b/R/targeted_event.R
@@ -1,8 +1,9 @@
 #' @title TargetedEvent Class
 #' @description Describes a targeted event in the simulation
 #' This is useful for events which are triggered for a sub-population.
+#' @importFrom R6 R6Class
 #' @export
-TargetedEvent <- R6::R6Class(
+TargetedEvent <- R6Class(
   'TargetedEvent',
   inherit = Event,
   public = list(

diff --git a/inst/include/Variable.h b/inst/include/Variable.h
@@ -9,6 +9,7 @@
 
 struct Variable {
     virtual void update() = 0;
+    virtual ~Variable() {};
 };
 
 #endif /* INST_INCLUDE_VARIABLE_H_ */
diff --git a/src/event.cpp b/src/event.cpp
@@ -115,7 +115,7 @@ void process_listener(
 ) {
     size_t t = event->t;
     (*listener)(t);
-};
+}
 
 // [[Rcpp::export]]
 void process_targeted_listener(

diff --git a/src/prefab.cpp b/src/prefab.cpp
@@ -56,7 +56,7 @@ Rcpp::XPtr<process_t> fixed_probability_multinomial_process_internal(
         }),
         true
     ); 
-};
+}
 
 
 // [[Rcpp::export]]
@@ -105,7 +105,7 @@ Rcpp::XPtr<process_t> multi_probability_multinomial_process_internal(
         }),
         true
     ); 
-};
+}
 
 // [[Rcpp::export]]
 Rcpp::XPtr<process_t> multi_probability_bernoulli_process_internal(
@@ -129,7 +129,7 @@ Rcpp::XPtr<process_t> multi_probability_bernoulli_process_internal(
         }),
         true
     ); 
-};
+}
 
 // [[Rcpp::export]]
 Rcpp::XPtr<process_t> infection_age_process_internal(
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,3 +14,4 @@ docs @@
     codecov.yml
     tests/performance
     joss
+    .vscode