Skip to content

Commit

Permalink
after restructuring plotting_constants.py
Browse files Browse the repository at this point in the history
  • Loading branch information
@lenarttreven
lenarttreven committed Jan 31, 2024
1 parent eaae3c6 commit 4f59ee7
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 67 deletions.
8 changes: 4 additions & 4 deletions experiments/1d_visualization/1d_visualization_plot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
PLOT_DICT_PATHS = [
(plotting_constants.METHODS[0], 'SinusoidsSim_BNN_SVGD_2.pkl'),
(plotting_constants.METHODS[1], 'SinusoidsSim_BNN_FSVGD_2.pkl'),
(plotting_constants.METHODS[2], 'SinusoidsSim_GreyBox_2.pkl'),
(plotting_constants.METHODS[4], 'SinusoidsSim_BNN_FSVGD_SimPrior_gp_2.pkl'),
(plotting_constants.METHODS[6], 'SinusoidsSim_BNN_FSVGD_SimPrior_nu-method_2.pkl'),
(plotting_constants.METHODS[14], 'SinusoidsSim_GreyBox_2.pkl'),
(plotting_constants.METHODS[7], 'SinusoidsSim_BNN_FSVGD_SimPrior_gp_2.pkl'),
(plotting_constants.METHODS[9], 'SinusoidsSim_BNN_FSVGD_SimPrior_nu-method_2.pkl'),
]
PLOT_DICT_PATHS = map(lambda x: (x[0], os.path.join(PLOT_DICT_DIR, x[1])), PLOT_DICT_PATHS)

Expand All @@ -58,7 +58,7 @@
linestyle=plotting_constants.SAMPLES_LINE_STYLE,
linewidth=plotting_constants.SAMPLES_LINE_WIDTH,
alpha=plotting_constants.SAMPLES_ALPHA)
axes[0][0].set_title(plotting_constants.METHODS[8], fontsize=TITLE_FONT_SIZE)
axes[0][0].set_title(plotting_constants.METHODS[3], fontsize=TITLE_FONT_SIZE)
axes[0][0].set_ylim((-14, 14))
axes[0][0].set_ylabel(r'$\vf(\vx)$', fontsize=LABEL_FONT_SIZE)

Expand Down
4 changes: 2 additions & 2 deletions experiments/bimodal_exp/plotting.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
r'\def\vx{{\bm{x}}}'
r'\def\vf{{\bm{f}}}')


mpl.rcParams['xtick.labelsize'] = TICKS_SIZE
mpl.rcParams['ytick.labelsize'] = TICKS_SIZE

Expand Down Expand Up @@ -203,6 +202,7 @@ def prepare_plot_multimodal(ax,
ax.set_title(title, fontsize=TITLE_FONT_SIZE)
ax.set_ylim((-4, 4))


def prepare_prior_plot(ax,
xs: np.ndarray,
fs: np.ndarray,
Expand Down Expand Up @@ -280,7 +280,7 @@ def two_rows_plot_with_table():
filenames = ['gp.pkl', 'kde.pkl', 'nu_method.pkl', 'ssge.pkl']

# names = ['GP', 'KDE', 'Nu-Method', 'SSGE']
names = [plotting_constants.METHODS[i] for i in [4, 5, 6, 7]]
names = [plotting_constants.METHODS[i] for i in [7, 8, 9, 10]]

# We join the folder path with models
filenames = [os.path.join(path_to_data_folder, name) for name in filenames]
Expand Down
8 changes: 4 additions & 4 deletions experiments/regression_exp/plots_num_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,17 +191,17 @@ def main(args, drop_nan=False, fig=None, show_legend=True, log_scale=False):
subfigs = figure.subfigures(1, 2, wspace=-0.05)

parser = argparse.ArgumentParser(description='Inspect results of a regression experiment.')
parser.add_argument('--exp_name', type=str, default='jan31')
parser.add_argument('--exp_name', type=str, default='jan10_num_data')
parser.add_argument('--quantile_cis', type=int, default=1)
parser.add_argument('--data_source', type=str, default='racecar_hf')
parser.add_argument('--data_source', type=str, default='racecar')
args = parser.parse_args()

main(args, fig=subfigs[0], show_legend=False, log_scale=True)

parser = argparse.ArgumentParser(description='Inspect results of a regression experiment.')
parser.add_argument('--exp_name', type=str, default='jan31')
parser.add_argument('--exp_name', type=str, default='jan10_num_data')
parser.add_argument('--quantile_cis', type=int, default=1)
parser.add_argument('--data_source', type=str, default='pendulum_hf')
parser.add_argument('--data_source', type=str, default='pendulum')
args = parser.parse_args()

main(args, fig=subfigs[1], show_legend=False, log_scale=True)
Expand Down
142 changes: 85 additions & 57 deletions plotting_hyperdata/plotting_constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,78 +17,116 @@

METHODS = ['SVGD',
'FSVGD',
'GreyBox + FSVGD',
'Sim Model',
'FSVGD[SimPrior=GP]',
'FSVGD[SimPrior=KDE]',
'FSVGD[SimPrior=Nu-Method]',
'FSVGD[SimPrior=SSGE]',
'Sampled Prior Functions',
'NP',
'PACOH',

'FSVGD[SimPrior[HF + GP]=GP]',
'FSVGD[SimPrior[LF + GP]=GP]',
'FSVGD[SimPrior[LF]=GP]',
'GreyBox[LF] + FSVGD',
'SysID[HF]',
'FSVGD[SimPrior[HF]=GP]',
'SysID[LF]',

'FSVGD[SimPrior[HF]=KDE]',
'FSVGD[SimPrior[HF]=Nu-Method]',
'FSVGD[SimPrior[HF]=SSGE]',

'FSVGD[SimPrior[LF + GP]=GP]',
'FSVGD[SimPrior[HF + GP]=GP]',

'GreyBox[LF] + FSVGD',
'GreyBox[HF] + FSVGD',

'SysID[LF]',
'SysID[HF]',
]

plot_real_regression_method_name_transfer = {
'BNN_FSVGD_SimPrior_hf_gp': METHODS[11],
'BNN_FSVGD': METHODS[1],
'BNN_FSVGD_SimPrior_gp': METHODS[12],
'BNN_FSVGD_SimPrior_gp_no_add_gp': METHODS[13],
'GreyBox': METHODS[14],
'SysID_hf': METHODS[15],
'BNN_FSVGD_SimPrior_hf_gp_no_add_gp': METHODS[16],
'BNN_SVGD': METHODS[0],
'SysID': METHODS[17],
'GreyBox_hf': METHODS[18],
}
# METHODS = ['SVGD',
# 'FSVGD',
# 'GreyBox + FSVGD',
# 'Sim Model',
# 'FSVGD[SimPrior=GP]',
# 'FSVGD[SimPrior=KDE]',
# 'FSVGD[SimPrior=Nu-Method]',
# 'FSVGD[SimPrior=SSGE]',
# 'Sampled Prior Functions',
# 'NP',
# 'PACOH',
#
# 'FSVGD[SimPrior[HF + GP]=GP]',
# 'FSVGD[SimPrior[LF + GP]=GP]',
# 'FSVGD[SimPrior[LF]=GP]',
# 'GreyBox[LF] + FSVGD',
# 'SysID[HF]',
# 'FSVGD[SimPrior[HF]=GP]',
# 'SysID[LF]',
# 'GreyBox[HF] + FSVGD',
# ]

LINE_STYLES = {'SVGD': linestyle_tuple['densely dashdotdotted'],
'FSVGD': linestyle_tuple['dashdot'],
'Sim Model': linestyle_tuple['densely dashdotted'],
'NP': linestyle_tuple['dashed'],
'PACOH': linestyle_tuple['loosely dashed'],

'FSVGD[SimPrior[LF]=GP]': linestyle_tuple['dotted'],
'FSVGD[SimPrior[HF]=GP]': linestyle_tuple['dashdotdotted'],

'FSVGD[SimPrior[HF]=KDE]': linestyle_tuple['dotted'],
'FSVGD[SimPrior[HF]=Nu-Method]': linestyle_tuple['densely dashed'],

'FSVGD[SimPrior[HF + GP]=GP]': linestyle_tuple['dashed'],
'FSVGD[SimPrior[LF + GP]=GP]': linestyle_tuple['densely dashed'],

'GreyBox[LF] + FSVGD': linestyle_tuple['dashdotted'],
'GreyBox[HF] + FSVGD': linestyle_tuple['densely dotted'],

'SysID[LF]': linestyle_tuple['long dash with offset'],
'SysID[HF]': linestyle_tuple['densely dashdotted'],
}

COLORS = {'SVGD': '#228B22',
'FSVGD': '#9BCD4C',
'GreyBox + FSVGD': '#CB3E3E',
'Sim Model': '#AF5227',
'FSVGD[SimPrior=GP]': '#DC6A73',
'FSVGD[SimPrior=KDE]': '#daa520',
'FSVGD[SimPrior=Nu-Method]': '#8486E0',
'NP': '#654321',
'PACOH': '#808080',

'FSVGD[SimPrior[LF]=GP]': "#e6d800",
'FSVGD[SimPrior[HF]=GP]': "#dc0ab4",

'FSVGD[SimPrior[HF]=KDE]': '#daa520',
'FSVGD[SimPrior[HF]=Nu-Method]': '#8486E0',

'FSVGD[SimPrior[HF + GP]=GP]': '#e60049',
'FSVGD[SimPrior[LF + GP]=GP]': "#0bb4ff",
'FSVGD[SimPrior[LF]=GP]': "#e6d800",

'GreyBox[LF] + FSVGD': "#9b19f5",
'GreyBox[HF] + FSVGD': "#00bfa0",

'SysID[HF]': "#ffa300",
'FSVGD[SimPrior[HF]=GP]': "#dc0ab4",
'SysID[LF]': "#b3d4ff",
'GreyBox[HF] + FSVGD': "#00bfa0",
}

LINE_STYLES = {'SVGD': linestyle_tuple['densely dashdotdotted'],
'FSVGD': linestyle_tuple['dashdot'],
'GreyBox + FSVGD': linestyle_tuple['dashdotdotted'],
'Sim Model': linestyle_tuple['densely dashdotted'],
'FSVGD[SimPrior=GP]': linestyle_tuple['dashdotted'],
'FSVGD[SimPrior=KDE]': linestyle_tuple['dotted'],
'FSVGD[SimPrior=Nu-Method]': linestyle_tuple['densely dashed'],
'NP': linestyle_tuple['dashed'],
'PACOH': linestyle_tuple['loosely dashed'],
plot_num_data_name_transfer = {
'BNN_FSVGD': METHODS[1],
'BNN_FSVGD_SimPrior_gp': METHODS[7],
'BNN_FSVGD_SimPrior_kde': METHODS[8],
'BNN_FSVGD_SimPrior_nu-method': METHODS[9],
'BNN_SVGD': METHODS[0],
'NP': METHODS[4],
'PACOH': METHODS[5]
}

'FSVGD[SimPrior[HF + GP]=GP]': linestyle_tuple['dashed'],
'FSVGD[SimPrior[LF + GP]=GP]': linestyle_tuple['densely dashed'],
'FSVGD[SimPrior[LF]=GP]': linestyle_tuple['dotted'],
'GreyBox[LF] + FSVGD': linestyle_tuple['dashdotted'],
'SysID[HF]': linestyle_tuple['densely dashdotted'],
'FSVGD[SimPrior[HF]=GP]': linestyle_tuple['dashdotdotted'],
'SysID[LF]': linestyle_tuple['long dash with offset'],
'GreyBox[HF] + FSVGD': linestyle_tuple['densely dotted'],
}
plot_real_regression_method_name_transfer = {
'BNN_FSVGD_SimPrior_hf_gp': METHODS[12],
'BNN_FSVGD': METHODS[1],
'BNN_FSVGD_SimPrior_gp': METHODS[11],
'BNN_FSVGD_SimPrior_gp_no_add_gp': METHODS[6],
'GreyBox': METHODS[13],
'SysID_hf': METHODS[16],
'BNN_FSVGD_SimPrior_hf_gp_no_add_gp': METHODS[7],
'BNN_SVGD': METHODS[0],
'SysID': METHODS[15],
'GreyBox_hf': METHODS[14],
}

plot_num_data_data_source_transfer = {
'pendulum': 'Pendulum[HF simulator]',
Expand All @@ -110,16 +148,6 @@
'nll': 'NLL',
}

plot_num_data_name_transfer = {
'BNN_FSVGD': METHODS[1],
'BNN_FSVGD_SimPrior_gp': METHODS[4],
'BNN_FSVGD_SimPrior_kde': METHODS[5],
'BNN_FSVGD_SimPrior_nu-method': METHODS[6],
'BNN_SVGD': METHODS[0],
'NP': METHODS[9],
'PACOH': METHODS[10]
}

TRUE_FUNCTION_COLOR = 'black'
TRUE_FUNCTION_LINE_STYLE = linestyle_tuple['densely dashed']
TRUE_FUNCTION_LINE_WIDTH = 4
Expand Down

0 comments on commit 4f59ee7

Please sign in to comment.