fix(?) boon tracking

If we throw away all empty queues before we register that they are
empty, we end up never removing some boons, getting crazy uptimes.

The current state is still not perfect, but it's much closer to what we
expect.

2 files changed, 22 insertions, 9 deletions

diff --git a/src/statistics/boon.rs b/src/statistics/boon.rs
index e1cf58e..0aa5ab2 100644
--- a/src/statistics/boon.rs
+++ b/src/statistics/boon.rs
@@ -1,7 +1,5 @@
 //! Module providing functions and structs to deal with boon related statistics.
 use std::cmp;
-
-use std::collections::HashMap;
 use std::fmt;
 use std::ops::Mul;
 
@@ -50,6 +48,7 @@ pub struct BoonQueue {
     queue: Vec<u64>,
     boon_type: BoonType,
     next_update: u64,
+    backlog: u64,
 }
 
 impl BoonQueue {
@@ -63,6 +62,7 @@ impl BoonQueue {
             queue: Vec::new(),
             boon_type,
             next_update: 0,
+            backlog: 0,
         }
     }
 
@@ -84,9 +84,11 @@ impl BoonQueue {
     ///
     /// * `duration` - Duration (in milliseconds) of the added stack.
     pub fn add_stack(&mut self, duration: u64) {
+        let backlog = self.backlog;
+        self.do_simulate(backlog);
         self.queue.push(duration);
         self.fix_queue();
-        self.next_update = self.next_change();
+        self.next_update = self.next_update();
     }
 
     /// Return the amount of current stacks.
@@ -114,8 +116,15 @@ impl BoonQueue {
         }
         if duration < self.next_update {
             self.next_update -= duration;
-            return;
+            self.backlog += duration;
+        } else {
+            let total = self.backlog + duration;
+            self.do_simulate(total);
         }
+    }
+
+    /// Simulate the thing without using the backlog.
+    fn do_simulate(&mut self, duration: u64) {
         let mut remaining = duration;
         match self.boon_type {
             BoonType::Duration => {
@@ -141,12 +150,15 @@ impl BoonQueue {
                     .collect();
             }
         }
-        self.next_update = self.next_change();
+        self.next_update = self.next_update();
+        self.backlog = 0;
     }
 
     /// Remove all stacks.
     pub fn clear(&mut self) {
         self.queue.clear();
+        self.next_update = 0;
+        self.backlog = 0;
     }
 
     /// Checks if any stacks are left.
@@ -261,7 +273,7 @@ impl BoonLog {
     /// * `b` - End time point.
     /// * `boon_id` - ID of the boon that you want to get the average for.
     pub fn average_stacks(&self, a: u64, b: u64, boon_id: u16) -> f32 {
-        assert!(b > a);
+        assert!(b >= a, "timespan is negative?!");
         let func = if let Some(f) = self.inner.get(&boon_id) {
             f
         } else {
diff --git a/src/statistics/trackers.rs b/src/statistics/trackers.rs
index 5eda86c..d18e9c5 100644
--- a/src/statistics/trackers.rs
+++ b/src/statistics/trackers.rs
@@ -253,7 +253,9 @@ impl BoonTracker {
             .values_mut()
             .flat_map(|m| m.values_mut())
             .for_each(|queue| queue.simulate(delta_t));
+    }
 
+    fn cleanup_queues(&mut self) {
         // Throw away empty boon queues or to improve performance
         self.boon_queues
             .values_mut()
@@ -262,9 +264,6 @@ impl BoonTracker {
     }
 
     fn update_logs(&mut self, time: u64) {
-        if time == self.last_time {
-            return;
-        }
         for (agent, boons) in &self.boon_queues {
             let agent_log = self
                 .boon_logs
@@ -338,8 +337,10 @@ impl Tracker for BoonTracker {
 
             _ => (),
         }
+
         self.update_logs(event.time);
         self.last_time = event.time;
+        self.cleanup_queues();
 
         Ok(())
     }