Merge pull request #185 from mrc-ide/release/0.1.13

Release v0.1.13

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: individual
 Title: Framework for Specifying and Simulating Individual Based Models
-Version: 0.1.12
+Version: 0.1.13
 Authors@R: c(
   person(
     given = "Giovanni",

NEWS.md

@@ -1,6 +1,7 @@
 # individual 0.1.13
 
   * Fixed the website generation.
+  * Fix an uninitialized memory-read that could cause spurious event triggers. 
 
 # individual 0.1.12
 

inst/include/Event.h

@@ -92,6 +92,9 @@ inline void Event::process(Rcpp::XPtr<listener_t> listener) {
 
 //' @title should first event fire on this timestep?
 inline bool Event::should_trigger() {
+    if (simple_schedule.empty()) {
+        return false;
+    }
     return *simple_schedule.begin() == get_time();
 }
 
@@ -179,7 +182,7 @@ inline TargetedEvent::TargetedEvent(size_t size)
 
 //' @title should first event fire on this timestep?
 inline bool TargetedEvent::should_trigger() {
-    if (targeted_schedule.begin() == targeted_schedule.end()) {
+    if (targeted_schedule.empty()) {
         return false;
     }
     return targeted_schedule.begin()->first == get_time();

tests/testthat/test-events.R

@@ -175,3 +175,16 @@ test_that("events are cleared when restored", {
   mockery::expect_args(listener, 1, t = 4)
   new_event$.tick()
 })
+
+test_that("empty event never triggers", {
+  event <- Event$new()
+  listener <- mockery::mock()
+  event$add_listener(listener)
+
+  for (i in seq(100)) {
+    event$.process()
+    event$.tick()
+  }
+
+  mockery::expect_called(listener, 0)
+})

tests/testthat/test-targetedevent.R

@@ -602,3 +602,16 @@ test_that("targeted events are cleared when restored", {
   new_event$.process()
   mockery::expect_called(listener, 1)
 })
+
+test_that("empty targeted event never triggers", {
+  event <- TargetedEvent$new(5)
+  listener <- mockery::mock()
+  event$add_listener(listener)
+
+  for (i in seq(100)) {
+    event$.process()
+    event$.tick()
+  }
+
+  mockery::expect_called(listener, 0)
+})