Skip to content
Snippets Groups Projects
Commit 71410d6f authored by STEVAN Antoine's avatar STEVAN Antoine :crab:
Browse files

remove all mentions to "naive" and "true" recoding (!132)

we are switching
- _naive recoding_ to _$(k, 1)$-re-encoding_
- _true recoding_ to _$k$-recoding_
parent e38dcb17
No related branches found
No related tags found
1 merge request!132remove all mentions to "naive" and "true" recoding
Pipeline #5332 passed
...@@ -100,7 +100,7 @@ export def combined [data: path, --recoding: path, --save: path] { ...@@ -100,7 +100,7 @@ export def combined [data: path, --recoding: path, --save: path] {
check-file $data --span (metadata $data).span check-file $data --span (metadata $data).span
check-file $recoding --span (metadata $recoding).span check-file $recoding --span (metadata $recoding).span
let true_recoding_graphs = open $recoding let recoding_graphs = open $recoding
| ns-to-ms $.times | ns-to-ms $.times
| compute-stats $.times | compute-stats $.times
| update label { from nuon } | update label { from nuon }
...@@ -124,7 +124,7 @@ export def combined [data: path, --recoding: path, --save: path] { ...@@ -124,7 +124,7 @@ export def combined [data: path, --recoding: path, --save: path] {
| rename --column { group: "name", items: "points" } | rename --column { group: "name", items: "points" }
| update name { $"$k = ($in)$" } | update name { $"$k = ($in)$" }
let naive_recoding_graphs = open $data let re_encoding_graphs = open $data
| update label { from json } | update label { from json }
| flatten label | flatten label
| insert key { $"($in.name) / ($in.k) / ($in.bytes)" } | insert key { $"($in.name) / ($in.k) / ($in.bytes)" }
...@@ -158,10 +158,10 @@ export def combined [data: path, --recoding: path, --save: path] { ...@@ -158,10 +158,10 @@ export def combined [data: path, --recoding: path, --save: path] {
| rename --column { group: "name", items: "points" } | rename --column { group: "name", items: "points" }
| reject name | reject name
let graphs = $true_recoding_graphs let graphs = $recoding_graphs
| append $naive_recoding_graphs | append $re_encoding_graphs
| append { | append {
name: "naive recoding ($k$-decoding + $1$-encoding)", name: "$(k, 1)$-re-encoding ($k$-decoding + $1$-encoding)",
legend: "second", legend: "second",
points: [], points: [],
style: { style: {
...@@ -175,7 +175,7 @@ export def combined [data: path, --recoding: path, --save: path] { ...@@ -175,7 +175,7 @@ export def combined [data: path, --recoding: path, --save: path] {
}, },
} }
| append { | append {
name: "true recoding ($k$-recoding)", name: "$k$-recoding",
legend: "second", legend: "second",
points: [], points: [],
style: { style: {
...@@ -203,7 +203,7 @@ export def ratio [data: path, --recoding: path, --save: path] { ...@@ -203,7 +203,7 @@ export def ratio [data: path, --recoding: path, --save: path] {
check-file $data --span (metadata $data).span check-file $data --span (metadata $data).span
check-file $recoding --span (metadata $recoding).span check-file $recoding --span (metadata $recoding).span
let true_recoding_graphs = open $recoding let recoding_graphs = open $recoding
| ns-to-ms times | ns-to-ms times
| compute-stats $.times | compute-stats $.times
| update label { from nuon } | update label { from nuon }
...@@ -212,7 +212,7 @@ export def ratio [data: path, --recoding: path, --save: path] { ...@@ -212,7 +212,7 @@ export def ratio [data: path, --recoding: path, --save: path] {
| select shards bytes mean | select shards bytes mean
| rename --column { shards: "k" } | rename --column { shards: "k" }
let naive_recoding_graphs = open $data let re_encoding_graphs = open $data
| update label { from json } | update label { from json }
| flatten label | flatten label
| insert key { $"($in.name) / ($in.k) / ($in.bytes)" } | insert key { $"($in.name) / ($in.k) / ($in.bytes)" }
...@@ -230,13 +230,13 @@ export def ratio [data: path, --recoding: path, --save: path] { ...@@ -230,13 +230,13 @@ export def ratio [data: path, --recoding: path, --save: path] {
| select k bytes mean | select k bytes mean
| uniq | uniq
let graphs = $true_recoding_graphs let graphs = $recoding_graphs
| rename --column { mean: "true" } | rename --column { mean: "recoding" }
| insert key { $"($in.k) ($in.bytes)" } | insert key { $"($in.k) ($in.bytes)" }
| join ($naive_recoding_graphs | rename --column { mean: "naive" } | insert key { $"($in.k) ($in.bytes)" }) key | join ($re_encoding_graphs | rename --column { mean: "re_encoding" } | insert key { $"($in.k) ($in.bytes)" }) key
| select k bytes $.true naive | select k bytes $.recoding re_encoding
| sort-by k bytes | sort-by k bytes
| insert cmp { $in.naive / $in.true } | insert cmp { $in.re_encoding / $in.recoding }
| rename --column { bytes: "x", cmp: "y" } | rename --column { bytes: "x", cmp: "y" }
| select k x y | select k x y
| group-by k --to-table | group-by k --to-table
......
...@@ -233,7 +233,7 @@ fn main() { ...@@ -233,7 +233,7 @@ fn main() {
match cli.test_case { match cli.test_case {
TestCase::EndToEnd => { 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, _>( let _ = end_to_end::<ark_pallas::Fr, _>(
&bytes, &bytes,
cli.k, cli.k,
...@@ -258,7 +258,7 @@ fn main() { ...@@ -258,7 +258,7 @@ fn main() {
let strategy = Strategy::from_str(&cli.strategy.unwrap()).unwrap(); let strategy = Strategy::from_str(&cli.strategy.unwrap()).unwrap();
eprintln!( eprintln!(
"true: k = {}, n = {}, strategy = {:?}, environment = {:?}", "k-recoding: k = {}, n = {}, strategy = {:?}, environment = {:?}",
cli.k, cli.n, strategy, environment, cli.k, cli.n, strategy, environment,
); );
let _ = recoding::<ark_pallas::Fr, _>( let _ = recoding::<ark_pallas::Fr, _>(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment