jakelevi1996 · August 7, 2024 09:59 · Aug 7, 2024 · Aug 7, 2024 · Aug 6, 2024 · Aug 6, 2024
diff --git a/plot_combined_scores.py b/plot_combined_scores.py
@@ -25,7 +25,6 @@
 ]
 scores = np.array(scores_list)
 
-
 titles = ["Boulder", "Lead", "Total"]
 ranges = [102, 102, 202]
 mp = plotting.MultiPlot(

diff --git a/plot_combined_scores.py b/plot_combined_scores.py
@@ -0,0 +1,44 @@
+import numpy as np
+from jutility import plotting
+
+scores_list = [
+    [69.0, 68.0, 137.0],
+    [54.1, 68.1, 122.2],
+    [48.7, 68.1, 116.8],
+    [28.7, 72.0, 100.7],
+    [44.7, 54.1, 98.8],
+    [34.1, 57.0, 91.1],
+    [33.8, 54.1, 87.9],
+    [34.2, 45.1, 79.3],
+    [29.7, 39.1, 68.8],
+    [54.4, 12.1, 66.5],
+    [49.2, 12.1, 61.3],
+    [29.0, 30.1, 59.1],
+    [24.7, 24.0, 48.7],
+    [34.3, 12.0, 46.3],
+    [34.0, 12.0, 46.0],
+    [19.6, 24.0, 43.6],
+    [24.0, 12.1, 36.1],
+    [18.9, 12.0, 30.9],
+    [9.4, 14.0, 23.4],
+    [9.4, 7.1, 16.5],
+]
+scores = np.array(scores_list)
+
+
+titles = ["Boulder", "Lead", "Total"]
+ranges = [102, 102, 202]
+mp = plotting.MultiPlot(
+    *[
+        plotting.Subplot(
+            plotting.Hist(scores[:, i], np.arange(r)),
+            title=t,
+        )
+        for i, (t, r) in enumerate(zip(titles, ranges))
+    ],
+    title="Men's Olympic sport climbing semifinal",
+    top_space=0.2,
+    figsize=[15, 4],
+    num_rows=1,
+)
+mp.save("combined")
diff --git a/plot_bouldering_scores.py b/plot_bouldering_scores.py
@@ -24,6 +24,7 @@
     [0.0, 0.0, 0.0, 0.0, 0.0],
 ]
 scores = np.array(scores_list)
+
 mp = plotting.MultiPlot(
     *[
         plotting.Subplot(

diff --git a/plot_bouldering_scores.py b/plot_bouldering_scores.py
@@ -41,5 +41,4 @@
 plotting.plot(
     plotting.Hist(scores[:, 4], np.arange(102)),
     plot_name="Women's Olympic bouldering semifinal overall scores",
-    figsize=[6, 4],
 )
diff --git a/plot_bouldering_scores.py b/plot_bouldering_scores.py
@@ -2,29 +2,28 @@
 from jutility import plotting
 
 scores_list = [
-    [24.9, 25.0, 9.5, 9.6, 69.0],
-    [9.8, 10.0, 9.8, 24.8, 54.4],
-    [9.8, 9.7, 9.9, 24.7, 54.1],
-    [10.0, 10.0, 4.8, 24.4, 49.2],
-    [9.6, 9.6, 4.7, 24.8, 48.7],
-    [24.9, 9.9, 5.0, 4.9, 44.7],
-    [10.0, 9.8, 4.8, 9.7, 34.3],
-    [9.9, 10.0, 9.3, 5.0, 34.2],
-    [4.9, 9.9, 9.8, 9.5, 34.1],
-    [9.6, 9.9, 9.5, 5.0, 34.0],
-    [10.0, 9.9, 9.1, 4.8, 33.8],
-    [10.0, 10.0, 4.9, 4.8, 29.7],
-    [4.9, 9.6, 5.0, 9.5, 29.0],
-    [9.9, 9.7, 4.1, 5.0, 28.7],
-    [5.0, 9.7, 5.0, 5.0, 24.7],
-    [4.5, 5.0, 9.5, 5.0, 24.0],
-    [0.0, 9.6, 5.0, 5.0, 19.6],
-    [0.0, 9.6, 4.5, 4.8, 18.9],
-    [0.0, 4.4, 0.0, 5.0, 9.4],
-    [0.0, 0.0, 4.7, 4.7, 9.4],
+    [25.0, 25.0, 24.9, 24.7, 99.6, ],
+    [24.9, 24.9, 25.0, 9.7, 84.5, ],
+    [24.4, 24.9, 9.8, 24.6, 83.7, ],
+    [25.0, 24.9, 24.8, 4.9, 79.6, ],
+    [9.8, 25.0, 9.8, 24.6, 69.2, ],
+    [9.8, 10.0, 24.5, 24.5, 68.8, ],
+    [24.8, 24.6, 10.0, 5.0, 64.4, ],
+    [5.0, 24.5, 10.0, 24.5, 64.0, ],
+    [4.8, 24.9, 9.4, 24.5, 63.6, ],
+    [5.0, 24.7, 24.9, 5.0, 59.6, ],
+    [0.0, 24.6, 4.7, 24.7, 54.0, ],
+    [4.7, 24.7, 10.0, 9.9, 49.3, ],
+    [5.0, 24.8, 9.7, 4.7, 44.2, ],
+    [4.9, 24.8, 5.0, 4.8, 39.5, ],
+    [4.8, 10.0, 10.0, 4.9, 29.7, ],
+    [5.0, 9.7, 9.8, 4.7, 29.2, ],
+    [4.6, 9.9, 9.7, 4.2, 28.4, ],
+    [0.0, 4.4, 5.0, 3.8, 13.2, ],
+    [0.0, 4.8, 5.0, 0.0, 9.8, ],
+    [0.0, 0.0, 0.0, 0.0, 0.0],
 ]
 scores = np.array(scores_list)
-
 mp = plotting.MultiPlot(
     *[
         plotting.Subplot(
@@ -33,10 +32,14 @@
         )
         for i in range(4)
     ],
+    title="Women's Olympic bouldering semifinal",
+    top_space=0.15,
+    figsize=[10, 6],
 )
 mp.save("boulders")
 
 plotting.plot(
     plotting.Hist(scores[:, 4], np.arange(102)),
-    plot_name="Overall score",
+    plot_name="Women's Olympic bouldering semifinal overall scores",
+    figsize=[6, 4],
 )
diff --git a/plot_bouldering_scores.py b/plot_bouldering_scores.py
@@ -24,18 +24,19 @@
     [0.0, 0.0, 4.7, 4.7, 9.4],
 ]
 scores = np.array(scores_list)
-sp_list = []
-for i in range(4):
-    sp = plotting.Subplot(
-        plotting.Hist(scores[:, i], np.arange(26)),
-        title="Boulder %i" % (i+1),
-    )
-    sp_list.append(sp)
 
-mp = plotting.MultiPlot(*sp_list)
-mp.save(".boulders")
+mp = plotting.MultiPlot(
+    *[
+        plotting.Subplot(
+            plotting.Hist(scores[:, i], np.arange(27)),
+            title="Boulder %i" % (i+1),
+        )
+        for i in range(4)
+    ],
+)
+mp.save("boulders")
 
 plotting.plot(
-    plotting.Hist(scores[:, 4], np.arange(101)),
+    plotting.Hist(scores[:, 4], np.arange(102)),
     plot_name="Overall score",
 )
diff --git a/plot_bouldering_scores.py b/plot_bouldering_scores.py
@@ -0,0 +1,41 @@
+import numpy as np
+from jutility import plotting
+
+scores_list = [
+    [24.9, 25.0, 9.5, 9.6, 69.0],
+    [9.8, 10.0, 9.8, 24.8, 54.4],
+    [9.8, 9.7, 9.9, 24.7, 54.1],
+    [10.0, 10.0, 4.8, 24.4, 49.2],
+    [9.6, 9.6, 4.7, 24.8, 48.7],
+    [24.9, 9.9, 5.0, 4.9, 44.7],
+    [10.0, 9.8, 4.8, 9.7, 34.3],
+    [9.9, 10.0, 9.3, 5.0, 34.2],
+    [4.9, 9.9, 9.8, 9.5, 34.1],
+    [9.6, 9.9, 9.5, 5.0, 34.0],
+    [10.0, 9.9, 9.1, 4.8, 33.8],
+    [10.0, 10.0, 4.9, 4.8, 29.7],
+    [4.9, 9.6, 5.0, 9.5, 29.0],
+    [9.9, 9.7, 4.1, 5.0, 28.7],
+    [5.0, 9.7, 5.0, 5.0, 24.7],
+    [4.5, 5.0, 9.5, 5.0, 24.0],
+    [0.0, 9.6, 5.0, 5.0, 19.6],
+    [0.0, 9.6, 4.5, 4.8, 18.9],
+    [0.0, 4.4, 0.0, 5.0, 9.4],
+    [0.0, 0.0, 4.7, 4.7, 9.4],
+]
+scores = np.array(scores_list)
+sp_list = []
+for i in range(4):
+    sp = plotting.Subplot(
+        plotting.Hist(scores[:, i], np.arange(26)),
+        title="Boulder %i" % (i+1),
+    )
+    sp_list.append(sp)
+
+mp = plotting.MultiPlot(*sp_list)
+mp.save(".boulders")
+
+plotting.plot(
+    plotting.Hist(scores[:, 4], np.arange(101)),
+    plot_name="Overall score",
+)