steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-05-23 07:16:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed prepare_plot and added LaTeX support

Browse Source
This commit is contained in:
romue 2021-06-02 10:31:49 +02:00
parent 38a3ef7687
commit c798226b26
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
environments/logging/plotting.py
View File

@ -18,9 +18,7 @@ PALETTE = 10 * (
) )
def plot(filepath, ext='png', **kwargs): def plot(filepath, ext='png'):
plt.rcParams.update(kwargs)
plt.tight_layout() plt.tight_layout()
figure = plt.gcf() figure = plt.gcf()
figure.savefig(str(filepath), format=ext) figure.savefig(str(filepath), format=ext)
@ -29,26 +27,14 @@ def plot(filepath, ext='png', **kwargs):
def prepare_plot(filepath, results_df, ext='png'): def prepare_plot(filepath, results_df, ext='png'):
results_df.Measurement = results_df.Measurement.str.replace('_', '-')
sns.set_theme(palette=PALETTE, style='whitegrid')
font_size = 16
tex_fonts = {
# Use LaTeX to write all text
"text.usetex": False,
"font.family": "serif",
# Use 10pt font in plots, to match 10pt font in document
"axes.labelsize": font_size,
"font.size": font_size,
# Make the legend/label fonts a little smaller
"legend.fontsize": font_size - 2,
"xtick.labelsize": font_size - 2,
"ytick.labelsize": font_size - 2
}
sns.lineplot(data=results_df, x='Episode', y='Score', hue='Measurement', ci='sd')
try: try:
plot(filepath, ext=ext, **tex_fonts) sns.set(rc={'text.usetex': True}, style='whitegrid')
sns.lineplot(data=results_df, x='Episode', y='Score', hue='Measurement', ci='sd', palette=PALETTE)
plot(filepath, ext=ext) # plot raises errors not lineplot!
except (FileNotFoundError, RuntimeError): except (FileNotFoundError, RuntimeError):
tex_fonts['text.usetex'] = False print('Struggling to plot Figure using LaTeX - going back to normal.')
plot(filepath, ext=ext, **tex_fonts) plt.close('all')
sns.set(rc={'text.usetex': False}, style='whitegrid')
sns.lineplot(data=results_df, x='Episode', y='Score', hue='Measurement', ci='sd', palette=PALETTE)
plot(filepath, ext=ext)

4
main.py
View File

@ -32,6 +32,8 @@ def combine_runs(run_path: Union[str, PathLike]):
df = df.fillna(0).rename(columns={'episode': 'Episode', 'run': 'Run'}) df = df.fillna(0).rename(columns={'episode': 'Episode', 'run': 'Run'})
columns = [col for col in df.columns if col not in IGNORED_DF_COLUMNS] columns = [col for col in df.columns if col not in IGNORED_DF_COLUMNS]
print(df.head())
non_overlapp_window = df.groupby(['Run', df['Episode'] // 20]).mean() non_overlapp_window = df.groupby(['Run', df['Episode'] // 20]).mean()
df_melted = non_overlapp_window[columns].reset_index().melt(id_vars=['Episode', 'Run'], df_melted = non_overlapp_window[columns].reset_index().melt(id_vars=['Episode', 'Run'],
@ -49,6 +51,8 @@ if __name__ == '__main__':
time_stamp = int(time.time()) time_stamp = int(time.time())
out_path = None out_path = None
combine_runs(Path('/Users/romue/PycharmProjects/EDYS/debug_out/A2C_1622571986'))
exit()
for modeL_type in [A2C, PPO, DQN]: for modeL_type in [A2C, PPO, DQN]:
for seed in range(5): for seed in range(5):