From 31a70480fb17b07f80d874e12814b42bf4c4808f Mon Sep 17 00:00:00 2001
From: Robin Meersman <echteenrobin@gmail.com>
Date: Sat, 16 May 2026 12:35:07 +0200
Subject: [PATCH] other: prep for merge conflicts with other branch

---
 scripts/plots/analyze_comparisons.py |  2 +-
 scripts/plots/analyze_convergence.py | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/scripts/plots/analyze_comparisons.py b/scripts/plots/analyze_comparisons.py
index 3ac6e8a..fa5c05c 100644
--- a/scripts/plots/analyze_comparisons.py
+++ b/scripts/plots/analyze_comparisons.py
@@ -172,7 +172,7 @@ def plot_grouped_bar(
             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
     ax.plot(
diff --git a/scripts/plots/analyze_convergence.py b/scripts/plots/analyze_convergence.py
index ec21a9a..cf2e2ce 100644
--- a/scripts/plots/analyze_convergence.py
+++ b/scripts/plots/analyze_convergence.py
@@ -44,11 +44,14 @@ class Columns(str, Enum):
     # ... (rest of the file remains same, just need to update plotting functions and obtain_data)
     """Column names expected in every evaluation CSV."""
 
-    CHECKPOINT = "checkpoint"
     ARCH = "architecture"
-    TIMESTEPS = "total_trained_timesteps"
-    REWARD = "accumulated_reward"
+    TIMESTEPS = "trained_timesteps"
+    REWARD = "eval_return"
     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.
@@ -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,
     and returns the combined DataFrame with only the required columns.
     """
-<<<<<<< Updated upstream
-    required = [Columns.TIMESTEPS, Columns.REWARD, Columns.VELOCITY]
-=======
     required = [
         Columns.CHECKPOINT,
         Columns.TIMESTEPS,
@@ -120,7 +120,6 @@ def load_metrics(file_mapping: dict[str, str]) -> pd.DataFrame:
         Columns.FINAL_XY_DIST,
         Columns.EVAL_STEPS,
     ]
->>>>>>> Stashed changes
     dfs = []
 
     for arch_name, filepath in file_mapping.items():