Skip to content

Commit 7d52718

Browse files
committed
Create a geo_diff_10 configuration
1 parent 5eb979e commit 7d52718

File tree

12 files changed

+45
-4
lines changed

12 files changed

+45
-4
lines changed

crates/geo_filters/evaluation/accuracy.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
![geo_diff_7](./accuracy/geo_diff_7.png)
66

7+
![geo_diff_10](./accuracy/geo_diff_10.png)
8+
79
![geo_diff_13](./accuracy/geo_diff_13.png)
810

911
## Geometric Distinct Count

crates/geo_filters/evaluation/accuracy.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use once_cell::sync::Lazy;
99
use regex::{Captures, Regex};
1010
use std::sync::Arc;
1111

12-
use geo_filters::diff_count::{GeoDiffCount, GeoDiffCount13, GeoDiffCount7};
12+
use geo_filters::diff_count::{GeoDiffCount, GeoDiffCount10, GeoDiffCount13, GeoDiffCount7};
1313
use geo_filters::distinct_count::{GeoDistinctCount, GeoDistinctCount13, GeoDistinctCount7};
1414
use geo_filters::evaluation::hll::{Hll, Hll14, Hll8, VariableHllConfig};
1515
use geo_filters::evaluation::simulation::{
@@ -30,6 +30,7 @@ fn main() {
3030
#[clap(after_help = "\x1b[1;4;37mConfigurations:\x1b[0;37m
3131
geo_diff/BUCKET_TYPE/b=N/bytes=N/msb=N
3232
geo_diff_7
33+
geo_diff_10
3334
geo_diff_13
3435
geo_distinct/BUCKET_TYPE/b=N/bytes=N/msb=N
3536
geo_distinct_7
@@ -44,6 +45,7 @@ fn main() {
4445
#[clap(after_long_help = "\x1b[1;4;37mConfigurations:\x1b[0;37m
4546
geo_diff/BUCKET_TYPE/b=N/bytes=N/msb=N Diff count with the given parameters
4647
geo_diff_7 Predefined configuration for b=7
48+
geo_diff_10 Predefined configuration for b=10
4749
geo_diff_13 Predefined configuration for b=13
4850
4951
geo_distinct/BUCKET_TYPE/b=N/bytes=N/msb=N Distinct count with the given parameters
@@ -180,6 +182,9 @@ static SIMULATION_CONFIG_FROM_STR: Lazy<Vec<SimulationConfigParser>> = Lazy::new
180182
SimulationConfigParser::new(r#"geo_diff_7"#, |_| {
181183
Box::new(|| Box::new(GeoDiffCount7::default()))
182184
}),
185+
SimulationConfigParser::new(r#"geo_diff_10"#, |_| {
186+
Box::new(|| Box::new(GeoDiffCount10::default()))
187+
}),
183188
SimulationConfigParser::new(r#"geo_diff_13"#, |_| {
184189
Box::new(|| Box::new(GeoDiffCount13::default()))
185190
}),
133 KB
Loading
1.04 KB
Loading
-419 Bytes
Loading
69 Bytes
Loading
232 Bytes
Loading
1.4 KB
Loading
118 Bytes
Loading

crates/geo_filters/scripts/generate-accuracy-plots

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ set -eu
77
plots_dir=evaluation/accuracy
88

99
cargo run --release --features evaluation --bin accuracy -- \
10-
-o accuracy.csv -n 10000 -m 5000000 geo_diff_{7,13} geo_distinct_{7,13} hll_{8,14} "$@"
10+
-o accuracy.csv -n 10000 -m 5000000 geo_diff_{7,10,13} geo_distinct_{7,13} hll_{8,14} "$@"
1111

1212
evaluation/plot-accuracy.r accuracy.csv
1313

1414
rm -f "$plots_dir"/*
1515

1616
idx=0
17-
for c in geo_diff_{7,13} geo_distinct_{7,13} hll_{8,14}; do
17+
for c in geo_diff_{7,10,13} geo_distinct_{7,13} hll_{8,14}; do
1818
echo "plot $c"
1919
convert -density 300 accuracy.pdf[$idx] -resize 1024x1024 -alpha remove -alpha off "$plots_dir/$c.png"
2020
idx=$(($idx + 1))

0 commit comments

Comments
 (0)