From 8ceadf70c94c6b8b00d2b8c23d203b57bed012d8 Mon Sep 17 00:00:00 2001
From: FreezyLemon <contact@freezylemon.com>
Date: Sun, 10 Nov 2024 21:16:54 +0100
Subject: [PATCH] refactor: Rewrite Empirical::cdf and ::sf

---
 src/distribution/empirical.rs | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/distribution/empirical.rs b/src/distribution/empirical.rs
index 98b26f81..95539624 100644
--- a/src/distribution/empirical.rs
+++ b/src/distribution/empirical.rs
@@ -2,6 +2,7 @@ use crate::distribution::ContinuousCDF;
 use crate::statistics::*;
 use non_nan::NonNan;
 use std::collections::BTreeMap;
+use std::ops::Bound;
 
 mod non_nan {
     use core::cmp::Ordering;
@@ -249,24 +250,18 @@ impl Distribution<f64> for Empirical {
 
 impl ContinuousCDF<f64, f64> for Empirical {
     fn cdf(&self, x: f64) -> f64 {
-        let mut sum = 0;
-        for (keys, values) in &self.data {
-            if keys.get() > x {
-                return sum as f64 / self.sum as f64;
-            }
-            sum += values;
-        }
+        let start = Bound::Unbounded;
+        let end = Bound::Included(NonNan::new(x).expect("x must not be NaN"));
+
+        let sum: u64 = self.data.range((start, end)).map(|(_, v)| v).sum();
         sum as f64 / self.sum as f64
     }
 
     fn sf(&self, x: f64) -> f64 {
-        let mut sum = 0;
-        for (keys, values) in self.data.iter().rev() {
-            if keys.get() <= x {
-                return sum as f64 / self.sum as f64;
-            }
-            sum += values;
-        }
+        let start = Bound::Excluded(NonNan::new(x).expect("x must not be NaN"));
+        let end = Bound::Unbounded;
+
+        let sum: u64 = self.data.range((start, end)).map(|(_, v)| v).sum();
         sum as f64 / self.sum as f64
     }