From acb08219263c7cee8c34a8451d9c02e6ee35eb7e Mon Sep 17 00:00:00 2001 From: Chuck McCallum Date: Thu, 8 May 2025 13:26:49 -0400 Subject: [PATCH 1/2] Include groups in means plot title --- .../code_generators/analyses/mean/__init__.py | 3 +++ .../mean/no-tests/_mean_notebook_output.py | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dp_wizard/utils/code_generators/analyses/mean/__init__.py b/dp_wizard/utils/code_generators/analyses/mean/__init__.py index 1056c97d..4a7080cd 100644 --- a/dp_wizard/utils/code_generators/analyses/mean/__init__.py +++ b/dp_wizard/utils/code_generators/analyses/mean/__init__.py @@ -26,6 +26,9 @@ def make_query(code_gen, identifier, accuracy_name, stats_name): def make_output(code_gen, column_name, accuracy_name, stats_name): return ( Template(f"mean_{code_gen.root_template}_output", __file__) + .fill_values( + GROUP_NAMES=code_gen.groups, + ) .fill_expressions( COLUMN_NAME=column_name, STATS_NAME=stats_name, diff --git a/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py b/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py index 41b8ceff..2e0f66e5 100644 --- a/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py +++ b/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py @@ -1,6 +1,9 @@ -if groups: - title = ( - f"DP means for COLUMN_NAME, " - f"assuming {contributions} contributions per individual" - ) - plot_bars(STATS_NAME, error=0, cutoff=0, title=title) +title = ( + f"DP means for COLUMN_NAME, " + f"assuming {contributions} contributions per individual" +) + +group_names = GROUP_NAMES +if group_names: + title += f" (grouped by {'/'.join(group_names)})" +plot_bars(STATS_NAME, error=0, cutoff=0, title=title) From 5e6cf53e0f53596b25503b6744828f005da806a8 Mon Sep 17 00:00:00 2001 From: Chuck McCallum Date: Thu, 8 May 2025 13:36:51 -0400 Subject: [PATCH 2/2] simplify by just using the "groups" variable that will be in context --- .../utils/code_generators/analyses/histogram/__init__.py | 1 - .../histogram/no-tests/_histogram_notebook_output.py | 5 ++--- .../analyses/histogram/no-tests/_histogram_script_output.py | 5 ++--- dp_wizard/utils/code_generators/analyses/mean/__init__.py | 3 --- .../analyses/mean/no-tests/_mean_notebook_output.py | 5 ++--- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dp_wizard/utils/code_generators/analyses/histogram/__init__.py b/dp_wizard/utils/code_generators/analyses/histogram/__init__.py index 9b22e4da..292d90d0 100644 --- a/dp_wizard/utils/code_generators/analyses/histogram/__init__.py +++ b/dp_wizard/utils/code_generators/analyses/histogram/__init__.py @@ -29,7 +29,6 @@ def make_output(code_gen, column_name, accuracy_name, stats_name): Template(f"histogram_{code_gen.root_template}_output", __file__) .fill_values( COLUMN_NAME=column_name, - GROUP_NAMES=code_gen.groups, ) .fill_expressions( ACCURACY_NAME=accuracy_name, diff --git a/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_notebook_output.py b/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_notebook_output.py index 1043dcf3..aa5c9f0e 100644 --- a/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_notebook_output.py +++ b/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_notebook_output.py @@ -5,7 +5,6 @@ f"assuming {contributions} contributions per individual" ) -group_names = GROUP_NAMES -if group_names: - title += f" (grouped by {'/'.join(group_names)})" +if groups: + title += f" (grouped by {'/'.join(groups)})" plot_bars(HISTOGRAM_NAME, error=ACCURACY_NAME, cutoff=0, title=title) diff --git a/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_script_output.py b/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_script_output.py index 339fb610..17c5fd33 100644 --- a/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_script_output.py +++ b/dp_wizard/utils/code_generators/analyses/histogram/no-tests/_histogram_script_output.py @@ -4,9 +4,8 @@ f"assuming {contributions} contributions per individual" ) -group_names = GROUP_NAMES -if group_names: - print(f"(grouped by {'/'.join(group_names)})") +if groups: + print(f"(grouped by {'/'.join(groups)})") print(CONFIDENCE_NOTE, ACCURACY_NAME) print(HISTOGRAM_NAME) diff --git a/dp_wizard/utils/code_generators/analyses/mean/__init__.py b/dp_wizard/utils/code_generators/analyses/mean/__init__.py index 4a7080cd..1056c97d 100644 --- a/dp_wizard/utils/code_generators/analyses/mean/__init__.py +++ b/dp_wizard/utils/code_generators/analyses/mean/__init__.py @@ -26,9 +26,6 @@ def make_query(code_gen, identifier, accuracy_name, stats_name): def make_output(code_gen, column_name, accuracy_name, stats_name): return ( Template(f"mean_{code_gen.root_template}_output", __file__) - .fill_values( - GROUP_NAMES=code_gen.groups, - ) .fill_expressions( COLUMN_NAME=column_name, STATS_NAME=stats_name, diff --git a/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py b/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py index 2e0f66e5..1ba11012 100644 --- a/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py +++ b/dp_wizard/utils/code_generators/analyses/mean/no-tests/_mean_notebook_output.py @@ -3,7 +3,6 @@ f"assuming {contributions} contributions per individual" ) -group_names = GROUP_NAMES -if group_names: - title += f" (grouped by {'/'.join(group_names)})" +if groups: + title += f" (grouped by {'/'.join(groups)})" plot_bars(STATS_NAME, error=0, cutoff=0, title=title)