adapting to different matplotlib #21

eclipse-sumo · Jan 1, 2025 · 5e18fd8 · 5e18fd8
1 parent fae3061
commit 5e18fd8
Show file tree

Hide file tree

Showing 13 changed files with 785 additions and 706 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
     rev: v3.2.0
     hooks:
     -   id: trailing-whitespace
-        exclude: '.*\.rtf'
+        exclude: '.*\.rtf|image.*\.tools'
     -   id: end-of-file-fixer
         exclude: '.*\.rtf'
     -   id: check-yaml

diff --git a/tests/tools/visualization/plot_csv_pie/paradigm/image.tools b/tests/tools/visualization/plot_csv_pie/paradigm/image.tools
@@ -6,11 +6,11 @@
   <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
    <cc:Work>
     <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:date>2024-06-07T14:32:57.287068</dc:date>
+    <dc:date>2025-01-01T11:34:35.434730</dc:date>
     <dc:format>image/svg+xml</dc:format>
     <dc:creator>
      <cc:Agent>
-      <dc:title>Matplotlib v3.8.4, https://matplotlib.org/</dc:title>
+      <dc:title>Matplotlib v3.6.3, https://matplotlib.org/</dc:title>
      </cc:Agent>
     </dc:creator>
    </cc:Work>
@@ -34,6 +34,7 @@ z
 C 354.456 211.359802 353.934685 204.5696 352.89664 197.849098 
 C 351.858595 191.128595 350.30687 184.497549 348.255111 178.014265 
 L 221.4 218.16 
+L 354.456 218.16 
 z
 " style="fill: #7fc97f"/>
    </g>
@@ -42,6 +43,7 @@ z
 C 346.203351 171.530982 343.657588 165.214518 340.640205 159.120415 
 C 337.622823 153.026312 334.142691 147.172484 330.230411 141.610403 
 L 221.4 218.16 
+L 348.255111 178.014265 
 z
 " style="fill: #beaed4"/>
    </g>
@@ -50,6 +52,7 @@ z
 C 326.31813 136.048321 321.985202 130.794337 317.269724 125.894648 
 C 312.554246 120.994959 307.47008 116.463967 302.061932 112.341514 
 L 221.4 218.16 
+L 330.230411 141.610403 
 z
 " style="fill: #fdc086"/>
    </g>
@@ -58,6 +61,7 @@ z
 C 291.229808 104.084544 279.193786 97.539562 266.375179 92.935672 
 C 253.556573 88.331781 240.106718 85.723335 226.496416 85.201639 
 L 221.4 218.16 
+L 302.061932 112.341514 
 z
 " style="fill: #ffff99"/>
    </g>
@@ -66,6 +70,7 @@ z
 C 202.583266 84.285026 178.859941 89.836497 157.836518 101.268671 
 C 136.813095 112.700844 119.258151 129.595782 107.02911 150.165893 
 L 221.4 218.16 
+L 226.496416 85.201639 
 z
 " style="fill: #386cb0"/>
    </g>
@@ -76,6 +81,7 @@ C 88.343999 242.090704 94.800064 265.583984 107.029103 286.154096
 C 119.258143 306.724209 136.813085 323.619148 157.836507 335.051324 
 C 178.859929 346.483499 202.583254 352.034972 226.496404 351.118361 
 L 221.4 218.16 
+L 107.02911 150.165893 
 z
 " style="fill: #f0027f"/>
    </g>
@@ -84,6 +90,7 @@ z
 C 260.865483 349.800966 293.419581 335.207205 317.269719 310.425357 
 C 341.119858 285.643508 354.456 252.554318 354.456 218.16 
 L 221.4 218.16 
+L 226.496404 351.118361 
 z
 " style="fill: #bf5b17"/>
    </g>

diff --git a/tests/tools/visualization/plot_csv_pie/plain/image.tools b/tests/tools/visualization/plot_csv_pie/plain/image.tools
@@ -6,11 +6,11 @@
   <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
    <cc:Work>
     <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:date>2024-06-07T14:32:57.399782</dc:date>
+    <dc:date>2025-01-01T11:34:35.534769</dc:date>
     <dc:format>image/svg+xml</dc:format>
     <dc:creator>
      <cc:Agent>
-      <dc:title>Matplotlib v3.8.4, https://matplotlib.org/</dc:title>
+      <dc:title>Matplotlib v3.6.3, https://matplotlib.org/</dc:title>
      </cc:Agent>
     </dc:creator>
    </cc:Work>
@@ -34,6 +34,7 @@ z
 C 342.6048 169.087842 342.187748 163.65568 341.357312 158.279278 
 C 340.526876 152.902876 339.285496 147.598039 337.644089 142.411412 
 L 236.16 174.528 
+L 342.6048 174.528 
 z
 "/>
    </g>
@@ -42,6 +43,7 @@ z
 C 336.002681 137.224785 333.96607 132.171615 331.552164 127.296332 
 C 329.138258 122.42105 326.354153 117.737987 323.224329 113.288322 
 L 236.16 174.528 
+L 337.644089 142.411412 
 z
 " style="fill: #1800a7"/>
    </g>
@@ -50,6 +52,7 @@ z
 C 320.094504 108.838657 316.628161 104.63547 312.855779 100.715718 
 C 309.083397 96.795967 305.016064 93.171174 300.689546 89.873212 
 L 236.16 174.528 
+L 323.224329 113.288322 
 z
 " style="fill: #0090dd"/>
    </g>
@@ -58,6 +61,7 @@ z
 C 292.023846 83.267635 282.395029 78.03165 272.140144 74.348537 
 C 261.885259 70.665425 251.125374 68.578668 240.237133 68.161311 
 L 236.16 174.528 
+L 300.689546 89.873212 
 z
 " style="fill: #00a13d"/>
    </g>
@@ -66,6 +70,7 @@ z
 C 221.106613 67.428021 202.127953 71.869198 185.309214 81.014936 
 C 168.490476 90.160675 154.446521 103.676626 144.663288 120.132714 
 L 236.16 174.528 
+L 240.237133 68.161311 
 z
 " style="fill: #00ec00"/>
    </g>
@@ -76,6 +81,7 @@ C 129.715199 193.672564 134.880051 212.467187 144.663283 228.923277
 C 154.446514 245.379367 168.490468 258.895318 185.309206 268.041059 
 C 202.127943 277.186799 221.106603 281.627978 240.237123 280.894689 
 L 236.16 174.528 
+L 144.663288 120.132714 
 z
 " style="fill: #f3e500"/>
    </g>
@@ -84,6 +90,7 @@ z
 C 267.732386 279.840773 293.775665 268.165764 312.855776 248.340285 
 C 331.935886 228.514806 342.6048 202.043455 342.6048 174.528 
 L 236.16 174.528 
+L 240.237123 280.894689 
 z
 " style="fill: #f90000"/>
    </g>
@@ -137,98 +144,98 @@ z
    </g>
    <g id="legend_1">
     <g id="patch_9">
-     <path d="M 110.104 302.584 
-L 204.72275 302.584 
-Q 206.72275 302.584 206.72275 300.584 
-L 206.72275 154.045875 
-Q 206.72275 152.045875 204.72275 152.045875 
-L 110.104 152.045875 
-Q 108.104 152.045875 108.104 154.045875 
-L 108.104 300.584 
-Q 108.104 302.584 110.104 302.584 
+     <path d="M 110.104 197.010125 
+L 204.72275 197.010125 
+Q 206.72275 197.010125 206.72275 195.010125 
+L 206.72275 48.472 
+Q 206.72275 46.472 204.72275 46.472 
+L 110.104 46.472 
+Q 108.104 46.472 108.104 48.472 
+L 108.104 195.010125 
+Q 108.104 197.010125 110.104 197.010125 
 z
 " style="fill: #ffffff; opacity: 0.8; stroke: #cccccc; stroke-linejoin: miter"/>
     </g>
     <g id="patch_10">
-     <path d="M 112.104 163.644312 
-L 132.104 163.644312 
-L 132.104 156.644312 
-L 112.104 156.644312 
+     <path d="M 112.104 58.070437 
+L 132.104 58.070437 
+L 132.104 51.070437 
+L 112.104 51.070437 
 z
 "/>
     </g>
     <g id="text_15">
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif; text-anchor: start" x="140.104" y="163.644312" transform="rotate(-0 140.104 163.644312)">NN</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif; text-anchor: start" x="140.104" y="58.070437" transform="rotate(-0 140.104 58.070437)">NN</text>
     </g>
     <g id="patch_11">
-     <path d="M 112.104 184.961187 
-L 132.104 184.961187 
-L 132.104 177.961187 
-L 112.104 177.961187 
+     <path d="M 112.104 79.387312 
+L 132.104 79.387312 
+L 132.104 72.387312 
+L 112.104 72.387312 
 z
 " style="fill: #1800a7"/>
     </g>
     <g id="text_16">
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 178.322438)">game</text>
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 189.52025)">theory</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 72.748562)">game</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 83.946375)">theory</text>
     </g>
     <g id="patch_12">
-     <path d="M 112.104 204.198375 
-L 132.104 204.198375 
-L 132.104 197.198375 
-L 112.104 197.198375 
+     <path d="M 112.104 98.6245 
+L 132.104 98.6245 
+L 132.104 91.6245 
+L 112.104 91.6245 
 z
 " style="fill: #0090dd"/>
     </g>
     <g id="text_17">
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif; text-anchor: start" x="140.104" y="204.198375" transform="rotate(-0 140.104 204.198375)">Q-learning</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif; text-anchor: start" x="140.104" y="98.6245" transform="rotate(-0 140.104 98.6245)">Q-learning</text>
     </g>
     <g id="patch_13">
-     <path d="M 112.104 225.51525 
-L 132.104 225.51525 
-L 132.104 218.51525 
-L 112.104 218.51525 
+     <path d="M 112.104 119.941375 
+L 132.104 119.941375 
+L 132.104 112.941375 
+L 112.104 112.941375 
 z
 " style="fill: #00a13d"/>
     </g>
     <g id="text_18">
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 218.8765)">fuzzy</text>
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 230.074312)">logic</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 113.302625)">fuzzy</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 124.500438)">logic</text>
     </g>
     <g id="patch_14">
-     <path d="M 112.104 251.391188 
-L 132.104 251.391188 
-L 132.104 244.391188 
-L 112.104 244.391188 
+     <path d="M 112.104 145.817312 
+L 132.104 145.817312 
+L 132.104 138.817312 
+L 112.104 138.817312 
 z
 " style="fill: #00ec00"/>
     </g>
     <g id="text_19">
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 244.752437)">genetic/</text>
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 255.95025)">evolutionary</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 139.178562)">genetic/</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 150.376375)">evolutionary</text>
     </g>
     <g id="patch_15">
-     <path d="M 112.104 277.267125 
-L 132.104 277.267125 
-L 132.104 270.267125 
-L 112.104 270.267125 
+     <path d="M 112.104 171.69325 
+L 132.104 171.69325 
+L 132.104 164.69325 
+L 112.104 164.69325 
 z
 " style="fill: #f3e500"/>
     </g>
     <g id="text_20">
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 270.628375)">own</text>
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 281.826188)">(unique)</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 165.0545)">own</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif" transform="translate(140.104 176.252312)">(unique)</text>
     </g>
     <g id="patch_16">
-     <path d="M 112.104 296.504312 
-L 132.104 296.504312 
-L 132.104 289.504312 
-L 112.104 289.504312 
+     <path d="M 112.104 190.930437 
+L 132.104 190.930437 
+L 132.104 183.930437 
+L 112.104 183.930437 
 z
 " style="fill: #f90000"/>
     </g>
     <g id="text_21">
-     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif; text-anchor: start" x="140.104" y="296.504312" transform="rotate(-0 140.104 296.504312)">other</text>
+     <text style="font: 10px 'DejaVu Sans', 'Bitstream Vera Sans', 'Computer Modern Sans Serif', 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid', 'Arial', 'Helvetica', 'Avant Garde', sans-serif; text-anchor: start" x="140.104" y="190.930437" transform="rotate(-0 140.104 190.930437)">other</text>
     </g>
    </g>
   </g>

diff --git a/tests/tools/visualization/plot_csv_pie/pm10effects/image.tools b/tests/tools/visualization/plot_csv_pie/pm10effects/image.tools
@@ -6,11 +6,11 @@
   <rdf:RDF xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
    <cc:Work>
     <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:date>2024-06-07T14:32:57.369061</dc:date>
+    <dc:date>2025-01-01T11:34:35.448919</dc:date>
     <dc:format>image/svg+xml</dc:format>
     <dc:creator>
      <cc:Agent>
-      <dc:title>Matplotlib v3.8.4, https://matplotlib.org/</dc:title>
+      <dc:title>Matplotlib v3.6.3, https://matplotlib.org/</dc:title>
      </cc:Agent>
     </dc:creator>
    </cc:Work>
@@ -33,6 +33,7 @@ z
     <path d="M 221.4 85.104 
 C 221.4 85.104 221.4 85.104 221.4 85.104 
 L 221.4 218.16 
+L 221.4 85.104 
 z
 " style="fill: #a50026"/>
    </g>
@@ -41,6 +42,7 @@ z
 C 221.260664 85.104 221.121328 85.104219 220.981993 85.104657 
 C 220.842658 85.105094 220.703323 85.105751 220.56399 85.106626 
 L 221.4 218.16 
+L 221.4 85.104 
 z
 " style="fill: #d22b27"/>
    </g>
@@ -49,6 +51,7 @@ z
 C 212.895902 85.154807 205.246313 85.865785 197.700692 87.231615 
 C 190.155071 88.597446 182.741627 90.613024 175.543191 93.255828 
 L 221.4 218.16 
+L 220.56399 85.106626 
 z
 " style="fill: #ee613e"/>
    </g>
@@ -59,6 +62,7 @@ C 99.042835 159.795655 90.023743 184.724216 88.556683 210.639872
 C 87.089624 236.555527 93.237749 262.34269 106.239856 284.808634 
 C 119.241963 307.274579 138.538353 325.452218 161.739926 337.090966 
 L 221.4 218.16 
+L 175.543191 93.255828 
 z
 " style="fill: #fa9b58"/>
    </g>
@@ -67,6 +71,7 @@ z
 C 165.352333 338.90308 169.045427 340.549669 172.807718 342.02561 
 C 176.57001 343.501551 180.397594 344.805312 184.278564 345.932838 
 L 221.4 218.16 
+L 161.739926 337.090966 
 z
 " style="fill: #fece7c"/>
    </g>
@@ -77,6 +82,7 @@ C 263.454313 345.982139 282.235631 338.185374 298.590374 326.536867
 C 314.945117 314.88836 328.452938 299.687498 338.098408 282.076982 
 C 347.743879 264.466466 353.279091 244.89892 354.287945 224.845303 
 L 221.4 218.16 
+L 184.278564 345.932838 
 z
 " style="fill: #fff1a8"/>
    </g>
@@ -85,6 +91,7 @@ z
 C 354.876867 213.138936 353.916359 201.405905 351.431386 189.951178 
 C 348.946414 178.49645 344.958696 167.420138 339.571881 157.010138 
 L 221.4 218.16 
+L 354.287945 224.845303 
 z
 " style="fill: #eef8a8"/>
    </g>
@@ -93,6 +100,7 @@ z
 C 329.207456 136.980925 313.919002 119.911722 295.148079 107.411998 
 C 276.377155 94.912273 254.732883 87.387645 232.256118 85.547618 
 L 221.4 218.16 
+L 339.571881 157.010138 
 z
 " style="fill: #c7e77f"/>
    </g>
@@ -101,6 +109,7 @@ z
 C 231.839503 85.513512 231.42273 85.48137 231.005812 85.451193 
 C 230.588894 85.421015 230.171836 85.392802 229.754653 85.366555 
 L 221.4 218.16 
+L 232.256118 85.547618 
 z
 " style="fill: #93d168"/>
    </g>
@@ -109,6 +118,7 @@ z
 C 228.920281 85.314061 228.085432 85.269432 227.250219 85.232674 
 C 226.415006 85.195915 225.579465 85.16703 224.743707 85.14602 
 L 221.4 218.16 
+L 229.754653 85.366555 
 z
 " style="fill: #57b65f"/>
    </g>
@@ -117,6 +127,7 @@ z
 C 224.186538 85.132014 223.629286 85.121509 223.071984 85.114506 
 C 222.514683 85.107502 221.957343 85.104 221.399997 85.104 
 L 221.4 218.16 
+L 224.743707 85.14602 
 z
 " style="fill: #17934e"/>
    </g>