From 0f0e64eac184be26d4025c64d49ab3fe748764ae Mon Sep 17 00:00:00 2001 From: Manos Date: Thu, 14 Oct 2021 06:12:48 +0200 Subject: [PATCH] Minor corrections --- code/expt/dist_cor.py | 24 ++++++++++++------------ graphics/evaluation/dist-cor-stg.pdf | Bin 16037 -> 16568 bytes text/related/main.tex | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/expt/dist_cor.py b/code/expt/dist_cor.py index 039c5db..9b37d4b 100644 --- a/code/expt/dist_cor.py +++ b/code/expt/dist_cor.py @@ -45,7 +45,7 @@ def main(args): x_margin = bar_width*(len(dist_type)/2 + 1) plt.xlim(x_i.min() - x_margin, x_i.max() + x_margin) # The y axis - plt.ylabel('Privacy loss') # Set y axis label. + plt.ylabel('Overall privacy loss') # Set y axis label. plt.yscale('log') plt.ylim(epsilon/10, 100*len(seq)) # plt.ylim(0, 10000) @@ -55,15 +55,15 @@ def main(args): e = np.zeros(len(lmdk_n)) a = np.zeros(len(lmdk_n)) for i, n in enumerate(lmdk_n): - for r in range(args.reps): + for r in range(args.iter): # Generate landmarks lmdks = lmdk_lib.get_lmdks(seq, n, d) # Uniform budget allocation e_cur = lmdk_bgt.uniform(seq, lmdks, epsilon) _, _, a_cur = gdp.tpl_lmdk_mem(e_cur, p, p, seq, lmdks) # Save privacy loss - e[i] += np.sum(e_cur)/args.reps - a[i] += np.sum(a_cur)/args.reps + e[i] += np.sum(e_cur)/args.iter + a[i] += np.sum(a_cur)/args.iter # Set label label = lmdk_lib.dist_type_to_str(d_i) if d_i == 1: @@ -94,21 +94,21 @@ def main(args): print(' [OK]', flush=True) -''' - Parse arguments. - - Optional: - reps - The number of repetitions. - time - The time limit of the sequence. -''' def parse_args(): + ''' + Parse arguments. + + Optional: + iter - The number of repetitions. + time - The time limit of the sequence. + ''' # Create argument parser. parser = argparse.ArgumentParser() # Mandatory arguments. # Optional arguments. - parser.add_argument('-r', '--reps', help='The number of repetitions.', type=int, default=1) + parser.add_argument('-i', '--iter', help='The number of repetitions.', type=int, default=1) parser.add_argument('-t', '--time', help='The time limit of the sequence.', type=int, default=100) # Parse arguments. diff --git a/graphics/evaluation/dist-cor-stg.pdf b/graphics/evaluation/dist-cor-stg.pdf index 8df46a5838cdc07418aa6b60ab54bb3007fc7a90..4d6ab406a34346663c30884c0589a1d9cea78970 100644 GIT binary patch delta 4407 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