tdpeuter/2026SEL3-project-Brittle_Star_Controller_Modularity
tdpeuter/2026SEL3-project-Brittle_Star_Controller_Modularity
Archived
1
Fork 0
Code Issues Releases Activity

other: prep for merge conflicts with other branch

Browse source
This commit is contained in:
Robin Meersman 2026-05-16 12:35:07 +02:00
parent 7334565d69
commit 31a70480fb
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/plots/analyze_comparisons.py
View file

@ -172,7 +172,7 @@ def plot_grouped_bar(
plt.FuncFormatter(lambda x, _: f"{x:.2f}" if abs(x) < 10 else f"{x:.0f}") plt.FuncFormatter(lambda x, _: f"{x:.2f}" if abs(x) < 10 else f"{x:.0f}")
) )
_add_square_placeholders(ax, x_ticks_pos, [f"{m} Arms" for m in morphologies]) # _add_square_placeholders(ax, x_ticks_pos, [f"{m} Arms" for m in morphologies])
# Add custom legend entry for best performer # Add custom legend entry for best performer
ax.plot( ax.plot(

13
scripts/plots/analyze_convergence.py
View file

@ -44,11 +44,14 @@ class Columns(str, Enum):
# ... (rest of the file remains same, just need to update plotting functions and obtain_data) # ... (rest of the file remains same, just need to update plotting functions and obtain_data)
"""Column names expected in every evaluation CSV.""" """Column names expected in every evaluation CSV."""
CHECKPOINT = "checkpoint"
ARCH = "architecture" ARCH = "architecture"
TIMESTEPS = "total_trained_timesteps" TIMESTEPS = "trained_timesteps"
REWARD = "accumulated_reward" REWARD = "eval_return"
VELOCITY = "velocity" VELOCITY = "velocity"
EVAL_STEPS = "eval_steps"
FINAL_XY_DIST = "final_xy_dist"
INITIAL_XY_DIST = "initial_xy_dist"
REACHED_TARGET = "reached_target"
# Maps architecture display names to the path of their evaluation CSV. # Maps architecture display names to the path of their evaluation CSV.
@ -109,9 +112,6 @@ def load_metrics(file_mapping: dict[str, str]) -> pd.DataFrame:
Loads one CSV per architecture, injects the architecture name as a column, Loads one CSV per architecture, injects the architecture name as a column,
and returns the combined DataFrame with only the required columns. and returns the combined DataFrame with only the required columns.
""" """
<<<<<<< Updated upstream
required = [Columns.TIMESTEPS, Columns.REWARD, Columns.VELOCITY]
=======
required = [ required = [
Columns.CHECKPOINT, Columns.CHECKPOINT,
Columns.TIMESTEPS, Columns.TIMESTEPS,
@ -120,7 +120,6 @@ def load_metrics(file_mapping: dict[str, str]) -> pd.DataFrame:
Columns.FINAL_XY_DIST, Columns.FINAL_XY_DIST,
Columns.EVAL_STEPS, Columns.EVAL_STEPS,
] ]
>>>>>>> Stashed changes
dfs = [] dfs = []
for arch_name, filepath in file_mapping.items(): for arch_name, filepath in file_mapping.items():