From 4cb48845436a1c9506ffd8189a84d031a91ef7cb Mon Sep 17 00:00:00 2001
From: "a.stevan" <antoine.stevan@isae-supaero.fr>
Date: Thu, 30 May 2024 15:13:56 +0200
Subject: [PATCH] remove all mentions to "naive" and "true" recoding
---
benchmarks/.nushell/fec/plot.nu | 26 +++++++++++++-------------
bins/inbreeding/src/main.rs | 4 ++--
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/benchmarks/.nushell/fec/plot.nu b/benchmarks/.nushell/fec/plot.nu
index 9ed47a41..56147f24 100644
--- a/benchmarks/.nushell/fec/plot.nu
+++ b/benchmarks/.nushell/fec/plot.nu
@@ -100,7 +100,7 @@ export def combined [data: path, --recoding: path, --save: path] {
check-file $data --span (metadata $data).span
check-file $recoding --span (metadata $recoding).span
- let true_recoding_graphs = open $recoding
+ let recoding_graphs = open $recoding
| ns-to-ms $.times
| compute-stats $.times
| update label { from nuon }
@@ -124,7 +124,7 @@ export def combined [data: path, --recoding: path, --save: path] {
| rename --column { group: "name", items: "points" }
| update name { $"$k = ($in)$" }
- let naive_recoding_graphs = open $data
+ let re_encoding_graphs = open $data
| update label { from json }
| flatten label
| insert key { $"($in.name) / ($in.k) / ($in.bytes)" }
@@ -158,10 +158,10 @@ export def combined [data: path, --recoding: path, --save: path] {
| rename --column { group: "name", items: "points" }
| reject name
- let graphs = $true_recoding_graphs
- | append $naive_recoding_graphs
+ let graphs = $recoding_graphs
+ | append $re_encoding_graphs
| append {
- name: "naive recoding ($k$-decoding + $1$-encoding)",
+ name: "$(k, 1)$-re-encoding ($k$-decoding + $1$-encoding)",
legend: "second",
points: [],
style: {
@@ -175,7 +175,7 @@ export def combined [data: path, --recoding: path, --save: path] {
},
}
| append {
- name: "true recoding ($k$-recoding)",
+ name: "$k$-recoding",
legend: "second",
points: [],
style: {
@@ -203,7 +203,7 @@ export def ratio [data: path, --recoding: path, --save: path] {
check-file $data --span (metadata $data).span
check-file $recoding --span (metadata $recoding).span
- let true_recoding_graphs = open $recoding
+ let recoding_graphs = open $recoding
| ns-to-ms times
| compute-stats $.times
| update label { from nuon }
@@ -212,7 +212,7 @@ export def ratio [data: path, --recoding: path, --save: path] {
| select shards bytes mean
| rename --column { shards: "k" }
- let naive_recoding_graphs = open $data
+ let re_encoding_graphs = open $data
| update label { from json }
| flatten label
| insert key { $"($in.name) / ($in.k) / ($in.bytes)" }
@@ -230,13 +230,13 @@ export def ratio [data: path, --recoding: path, --save: path] {
| select k bytes mean
| uniq
- let graphs = $true_recoding_graphs
- | rename --column { mean: "true" }
+ let graphs = $recoding_graphs
+ | rename --column { mean: "recoding" }
| insert key { $"($in.k) ($in.bytes)" }
- | join ($naive_recoding_graphs | rename --column { mean: "naive" } | insert key { $"($in.k) ($in.bytes)" }) key
- | select k bytes $.true naive
+ | join ($re_encoding_graphs | rename --column { mean: "re_encoding" } | insert key { $"($in.k) ($in.bytes)" }) key
+ | select k bytes $.recoding re_encoding
| sort-by k bytes
- | insert cmp { $in.naive / $in.true }
+ | insert cmp { $in.re_encoding / $in.recoding }
| rename --column { bytes: "x", cmp: "y" }
| select k x y
| group-by k --to-table
diff --git a/bins/inbreeding/src/main.rs b/bins/inbreeding/src/main.rs
index 47ace20f..a6e34039 100644
--- a/bins/inbreeding/src/main.rs
+++ b/bins/inbreeding/src/main.rs
@@ -233,7 +233,7 @@ fn main() {
match cli.test_case {
TestCase::EndToEnd => {
- eprintln!("naive: k = {}, n = {}", cli.k, cli.n);
+ eprintln!("(k, 1)-re-encoding: k = {}, n = {}", cli.k, cli.n);
let _ = end_to_end::<ark_pallas::Fr, _>(
&bytes,
cli.k,
@@ -258,7 +258,7 @@ fn main() {
let strategy = Strategy::from_str(&cli.strategy.unwrap()).unwrap();
eprintln!(
- "true: k = {}, n = {}, strategy = {:?}, environment = {:?}",
+ "k-recoding: k = {}, n = {}, strategy = {:?}, environment = {:?}",
cli.k, cli.n, strategy, environment,
);
let _ = recoding::<ark_pallas::Fr, _>(
--
GitLab