From 4b6a0d6164015fa0e7da917d9b26226c59c16c99 Mon Sep 17 00:00:00 2001 From: Youngjoon Lee <5462944+youngjoon-lee@users.noreply.github.com> Date: Sun, 25 Aug 2024 01:55:58 +0900 Subject: [PATCH] add --reverse-order, and reorder exp6 paramset M to reflect the weight properly --- mixnet-rs/ordering/src/main.rs | 7 +++++++ mixnet-rs/ordering/src/paramset.rs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mixnet-rs/ordering/src/main.rs b/mixnet-rs/ordering/src/main.rs index ff838bd..3f86450 100644 --- a/mixnet-rs/ordering/src/main.rs +++ b/mixnet-rs/ordering/src/main.rs @@ -31,6 +31,8 @@ struct Args { outdir: String, #[arg(short, long)] num_threads: usize, + #[arg(short, long, default_value_t = false)] + reverse_order: bool, #[arg(short, long)] from_paramset: Option, #[arg(short, long)] @@ -48,6 +50,7 @@ fn main() { queue_type, outdir, num_threads, + reverse_order, from_paramset, to_paramset, } = args; @@ -93,6 +96,10 @@ fn main() { } } + if reverse_order { + iterations.reverse(); + } + let pool = rayon::ThreadPoolBuilder::new() .num_threads(num_threads) .build() diff --git a/mixnet-rs/ordering/src/paramset.rs b/mixnet-rs/ordering/src/paramset.rs index f04a580..e91e35c 100644 --- a/mixnet-rs/ordering/src/paramset.rs +++ b/mixnet-rs/ordering/src/paramset.rs @@ -110,7 +110,7 @@ impl ParamSet { ExperimentId::Experiment2 | ExperimentId::Experiment4 => vec![0.001, 0.01, 0.1], ExperimentId::Experiment6 => { let g: f32 = num_mixes as f32; - vec![2.0 / g, 1.0 / g, 1.0 / (2.0 * g)] + vec![1.0 / (2.0 * g), 1.0 / g, 2.0 / g] } };