mirror of
https://github.com/storytold/gridcraft.git
synced 2026-11-03 08:51:30 -06:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19c6f70e2a |
@@ -50,12 +50,27 @@ pub(super) fn median(v: Vec<f64>) -> R<f64> {
|
|||||||
|
|
||||||
/// Values occurring at least twice, ordered by first occurrence, with their (equal, maximal) count.
|
/// Values occurring at least twice, ordered by first occurrence, with their (equal, maximal) count.
|
||||||
fn modes(v: &[f64]) -> Vec<f64> {
|
fn modes(v: &[f64]) -> Vec<f64> {
|
||||||
|
// Index of each distinct number in `counts`, so counting is linear rather than a search of
|
||||||
|
// every distinct number so far. Keyed by bits with -0 folded into 0 (they compare equal); NaN
|
||||||
|
// never equals anything, so it is never merged.
|
||||||
|
let mut index: std::collections::HashMap<u64, usize> = std::collections::HashMap::new();
|
||||||
let mut counts: Vec<(f64, usize)> = Vec::new();
|
let mut counts: Vec<(f64, usize)> = Vec::new();
|
||||||
for &x in v {
|
for &x in v {
|
||||||
if let Some(e) = counts.iter_mut().find(|e| e.0 == x) {
|
if x.is_nan() {
|
||||||
e.1 += 1;
|
|
||||||
} else {
|
|
||||||
counts.push((x, 1));
|
counts.push((x, 1));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let key = if x == 0.0 { 0 } else { x.to_bits() };
|
||||||
|
match index.entry(key) {
|
||||||
|
std::collections::hash_map::Entry::Occupied(e) => {
|
||||||
|
if let Some(c) = counts.get_mut(*e.get()) {
|
||||||
|
c.1 += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
std::collections::hash_map::Entry::Vacant(e) => {
|
||||||
|
e.insert(counts.len());
|
||||||
|
counts.push((x, 1));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let best = counts.iter().map(|e| e.1).max().unwrap_or(0);
|
let best = counts.iter().map(|e| e.1).max().unwrap_or(0);
|
||||||
@@ -455,7 +470,10 @@ pub(super) fn frequency(a: &[Arg], _: C) -> R<Value> {
|
|||||||
order.sort_by(|&i, &j| bins.get(i).copied().unwrap_or(0.0).total_cmp(&bins.get(j).copied().unwrap_or(0.0)));
|
order.sort_by(|&i, &j| bins.get(i).copied().unwrap_or(0.0).total_cmp(&bins.get(j).copied().unwrap_or(0.0)));
|
||||||
let mut counts = vec![0.0; bins.len() + 1];
|
let mut counts = vec![0.0; bins.len() + 1];
|
||||||
for x in data {
|
for x in data {
|
||||||
let slot = order.iter().find(|&&i| x <= bins.get(i).copied().unwrap_or(f64::INFINITY)).copied().unwrap_or(bins.len());
|
// `order` sorts the bins ascending, so the bins `x` exceeds come first: binary search for
|
||||||
|
// the first bin at or above `x` (the first of equal bins, as a linear scan would find).
|
||||||
|
let pos = order.partition_point(|&i| bins.get(i).copied().unwrap_or(f64::INFINITY) < x);
|
||||||
|
let slot = order.get(pos).copied().unwrap_or(bins.len());
|
||||||
if let Some(c) = counts.get_mut(slot) {
|
if let Some(c) = counts.get_mut(slot) {
|
||||||
*c += 1.0;
|
*c += 1.0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -617,3 +617,20 @@ fn aggregate_helper() {
|
|||||||
close(aggregate_values_k(9, &vals, &nv(2.0)), 9.0);
|
close(aggregate_values_k(9, &vals, &nv(2.0)), 9.0);
|
||||||
is_err(aggregate_values_k(14, &vals, &nv(10.0)), CellError::Num);
|
is_err(aggregate_values_k(14, &vals, &nv(10.0)), CellError::Num);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Security: FREQUENCY finds each value's bin by binary search, and MODE counts distinct numbers
|
||||||
|
/// through an index, so neither is quadratic in its inputs. Results are as before: unsorted and
|
||||||
|
/// duplicate bins keep their positions (a value goes to the first of equal bins), and tied modes
|
||||||
|
/// come in first-occurrence order.
|
||||||
|
#[test]
|
||||||
|
fn frequency_and_mode_scale_with_their_inputs() {
|
||||||
|
let f = ev("FREQUENCY", vec![c(&[1.0, 2.0, 2.0, 3.0, 5.0, 9.0, -1.0]), c(&[3.0, 2.0, 2.0, 0.0])]);
|
||||||
|
assert_eq!(rows_of(&f), vec![vec![nv(1.0)], vec![nv(3.0)], vec![nv(0.0)], vec![nv(1.0)], vec![nv(2.0)]]);
|
||||||
|
let data: Vec<f64> = (0..200_000).map(|i| f64::from(i) + 1e6).collect();
|
||||||
|
let bins: Vec<f64> = (0..200_000).map(f64::from).collect();
|
||||||
|
let f = ev("FREQUENCY", vec![c(&data), c(&bins)]);
|
||||||
|
assert_eq!(rows_of(&f).last(), Some(&vec![nv(200_000.0)]));
|
||||||
|
let distinct = ev("MODE", vec![c(&data)]);
|
||||||
|
is_err(distinct, CellError::NA);
|
||||||
|
assert_eq!(rows_of(&ev("MODE.MULT", vec![c(&[3.0, 0.0, 1.0, -0.0, 3.0, 1.0])])), vec![vec![nv(3.0)], vec![nv(0.0)], vec![nv(1.0)]]);
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user