allow choosing marker

tools/plot_MSD_comp.py

@@ -76,9 +76,19 @@ experiments = [
     },
     {  # Experiment 5
         "strategies": [
-            {"prefix": "he", "label": "half-edge collapse", "marker": "o"},
-            {"prefix": "e", "label": "edge collapse", "marker": "^"},
-            {"prefix": "k", "label": "kernel mean", "marker": "p"},
+            {
+                "prefix": "he",
+                "label": "half-edge collapse",
+                "color": "#4c72b0",
+                "marker": "o",
+            },
+            {
+                "prefix": "e",
+                "label": "edge collapse",
+                "color": "#dd8452",
+                "marker": "o",
+            },
+            {"prefix": "k", "label": "kernel mean", "color": "#55a868", "marker": "o"},
         ],
         "angles": ["28", "30", "32", "35", "38", "40"],
         "axis_lims": [5, 55],
@@ -154,6 +164,7 @@ def plot_strategies(strategies, angles, res_dir):
         prefix = strat["prefix"]
         label = strat["label"]
         marker = strat["marker"]
+        color = strat["color"]
 
         # Get similarity files for just this strategy, of every angle
         all_sim_files = glob.glob(os.path.join(res_dir, f"{prefix}*-MSD.data"))
@@ -179,12 +190,17 @@ def plot_strategies(strategies, angles, res_dir):
 
             sim_mean = read_MSD(sim_file)
             compression = read_comp(comp_file)
-            color = angle_colors[angle]
 
             plt.scatter(compression, sim_mean, marker=marker, s=100, color=color)
+            plt.annotate(
+                text=f"{angle}°",
+                xy=(compression, sim_mean),
+                xytext=(compression - 0.1, sim_mean + 1.5),
+                fontsize=8,
+            )
 
         # Create a legend for this strategy
-        append_legend(strat["marker"], "gray", label)
+        append_legend(marker, color, label)
 
 
 def plot_random(res_dir):
@@ -239,7 +255,7 @@ if __name__ == "__main__":
         plot_random(res_dir)
 
     # Add angle legends
-    add_angle_legends(angles)
+    # add_angle_legends(angles)
 
     # Show plot
     plt.legend(handles=legends, title="SHAVER Configuration")